summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Leibowitz <michael.leibowitz@intel.com>2013-07-17 20:58:51 (GMT)
committerMichael Leibowitz <michael.leibowitz@intel.com>2013-07-17 20:58:51 (GMT)
commit0b466302afcb0ce0e23f0d8f1e1e9820e42326dc (patch)
tree6e5db1d2ad88ba0ae84e90e10bf6bc41dee6a185
parent35decce262811d55ce3fdd1097c0657212ee8be9 (diff)
downloadlibslp-sensor-0b466302afcb0ce0e23f0d8f1e1e9820e42326dc.zip
libslp-sensor-0b466302afcb0ce0e23f0d8f1e1e9820e42326dc.tar.gz
libslp-sensor-0b466302afcb0ce0e23f0d8f1e1e9820e42326dc.tar.bz2
put manifests in packaging/ consistent use of %{name} macros Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>
-rw-r--r--libslp-sensor.manifest6
-rw-r--r--packaging/sensor-devel.manifest5
-rw-r--r--packaging/sensor.manifest6
-rw-r--r--packaging/sensor.spec8
4 files changed, 12 insertions, 13 deletions
diff --git a/libslp-sensor.manifest b/libslp-sensor.manifest
deleted file mode 100644
index 41a9320..0000000
--- a/libslp-sensor.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
- <request>
- <domain name="_"/>
- </request>
-</manifest>
-
diff --git a/packaging/sensor-devel.manifest b/packaging/sensor-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/sensor-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+ <domain name="_" />
+ </request>
+</manifest>
diff --git a/packaging/sensor.manifest b/packaging/sensor.manifest
index 017d22d..c00c25b 100644
--- a/packaging/sensor.manifest
+++ b/packaging/sensor.manifest
@@ -1,5 +1,5 @@
<manifest>
- <request>
- <domain name="_"/>
- </request>
+ <request>
+ <domain name="_" />
+ </request>
</manifest>
diff --git a/packaging/sensor.spec b/packaging/sensor.spec
index 39affd9..407225b 100644
--- a/packaging/sensor.spec
+++ b/packaging/sensor.spec
@@ -5,7 +5,8 @@ Release: 1
Group: System/Sensor Framework
License: Apache-2.0
Source0: sensor-%{version}.tar.gz
-Source1001: sensor.manifest
+Source1001: %{name}.manifest
+Source1002: %{name}-devel.manifest
BuildRequires: cmake
BuildRequires: vconf-keys-devel
BuildRequires: pkgconfig(sf_common)
@@ -26,7 +27,7 @@ Sensor framework client library (devel)
%prep
%setup -q -n %{name}-%{version}
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} .
%build
%cmake .
@@ -45,12 +46,11 @@ make %{?jobs:-j%jobs}
%files
%manifest %{name}.manifest
%license LICENSE
-%manifest libslp-sensor.manifest
%defattr(-,root,root,-)
%{_libdir}/libsensor.so.*
%files devel
-%manifest %{name}.manifest
+%manifest %{name}-devel.manifest
%defattr(-,root,root,-)
%{_includedir}/sensor/*.h
%{_libdir}/libsensor.so