From 0b466302afcb0ce0e23f0d8f1e1e9820e42326dc Mon Sep 17 00:00:00 2001 From: Michael Leibowitz Date: Wed, 17 Jul 2013 13:58:51 -0700 Subject: [PATCH] Fix manifests put manifests in packaging/ consistent use of %{name} macros Signed-off-by: Michael Leibowitz --- libslp-sensor.manifest | 6 ------ packaging/sensor-devel.manifest | 5 +++++ packaging/sensor.manifest | 6 +++--- packaging/sensor.spec | 8 ++++---- 4 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 libslp-sensor.manifest create mode 100644 packaging/sensor-devel.manifest 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 @@ - - - - - - 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 @@ + + + + + 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 @@ - - - + + + 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 -- 2.7.4