sensord: move manifest files to packaging directory

Change-Id: Ida30ea320f5aec3522c13467f093c5aa1f1c1b59
Signed-off-by: Kibak Yoon <kibak.yoon@samsung.com>

diff --git a/libsensord.manifest b/libsensord.manifest
deleted file mode 100644 (file)
index 75b0fa5..0000000
--- a/libsensord.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_"/>
-    </request>
-</manifest>

diff --git a/packaging/libsensord.manifest b/packaging/libsensord.manifest
new file mode 100644 (file)
index 0000000..75b0fa5
--- /dev/null
+++ b/packaging/libsensord.manifest
@@ -0,0 +1,5 @@
+<manifest>
+    <request>
+        <domain name="_"/>
+    </request>
+</manifest>

diff --git a/packaging/sensord.manifest b/packaging/sensord.manifest
new file mode 100755 (executable)
index 0000000..75b0fa5
--- /dev/null
+++ b/packaging/sensord.manifest
@@ -0,0 +1,5 @@
+<manifest>
+    <request>
+        <domain name="_"/>
+    </request>
+</manifest>

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index 86e131e80462a5e80bb1ed21d6345b24ee9f47d7..c7070c75357bc862a45a00853befa0387745351a 100755 (executable)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -5,8 +5,8 @@ Release:    0
 Group:         System/Sensor Framework
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1:    sensord.service
-Source2:    sensord.socket
+Source1:       sensord.manifest
+Source2:       libsensord.manifest
 
 %define accel_state ON
 %define gyro_state ON
@@ -72,6 +72,8 @@ Sensor functional testing
 
 %prep
 %setup -q
+cp %{SOURCE1} .
+cp %{SOURCE2} .
 
 %build
 #CFLAGS+=" -fvisibility=hidden "; export CFLAGS
@@ -105,11 +107,11 @@ systemctl daemon-reload
 systemctl daemon-reload
 
 %files -n sensord
-%manifest sensord.manifest
 %{_bindir}/sensord
 %attr(0644,root,root)/usr/etc/sensor_plugins.xml
 %attr(0644,root,root)/usr/etc/sensors.xml
 %attr(0644,root,root)/usr/etc/virtual_sensors.xml
+%manifest sensord.manifest
 %{_unitdir}/sensord.service
 %{_unitdir}/sensord.socket
 %{_unitdir}/multi-user.target.wants/sensord.service
@@ -118,8 +120,8 @@ systemctl daemon-reload
 %{_datadir}/license/sensord
 
 %files -n libsensord
-%manifest libsensord.manifest
 %defattr(-,root,root,-)
+%manifest libsensord.manifest
 %{_libdir}/libsensor.so.*
 %{_libdir}/sensord/*.so*
 %{_libdir}/libsensord-share.so

diff --git a/sensord.manifest b/sensord.manifest
deleted file mode 100755 (executable)
index 75b0fa5..0000000
--- a/sensord.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_"/>
-    </request>
-</manifest>