From 204d913d2a8b389f29a5fda50cda85757f1d9a94 Mon Sep 17 00:00:00 2001 From: Kibak Yoon Date: Tue, 6 Jan 2015 21:05:38 +0900 Subject: [PATCH] sensord: move manifest files to packaging directory Change-Id: Ida30ea320f5aec3522c13467f093c5aa1f1c1b59 Signed-off-by: Kibak Yoon --- libsensord.manifest => packaging/libsensord.manifest | 0 sensord.manifest => packaging/sensord.manifest | 0 packaging/sensord.spec | 10 ++++++---- 3 files changed, 6 insertions(+), 4 deletions(-) rename libsensord.manifest => packaging/libsensord.manifest (100%) rename sensord.manifest => packaging/sensord.manifest (100%) diff --git a/libsensord.manifest b/packaging/libsensord.manifest similarity index 100% rename from libsensord.manifest rename to packaging/libsensord.manifest diff --git a/sensord.manifest b/packaging/sensord.manifest similarity index 100% rename from sensord.manifest rename to packaging/sensord.manifest diff --git a/packaging/sensord.spec b/packaging/sensord.spec index 86e131e..c7070c7 100755 --- 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 -- 2.7.4