sensord: move .service/.socket to packaging

Change-Id: Iaea00fe48fed8c44e20c24efbfc088e0c16f9cf9
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1994fe5..9b88ac8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ INCLUDE_DIRECTORIES(
 )
 
 # Sub-directory
-ADD_SUBDIRECTORY(systemd)
 ADD_SUBDIRECTORY(src/server)
 ADD_SUBDIRECTORY(src/client)
 ADD_SUBDIRECTORY(src/shared)

diff --git a/systemd/sensord.service b/packaging/sensord.service
similarity index 100%
rename from systemd/sensord.service
rename to packaging/sensord.service

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index 7b93195..fdc6316 100644 (file)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -2,11 +2,13 @@ Name:       sensord
 Summary:    Sensor daemon
 Version:    2.0.2
 Release:    0
-Group:         System/Sensor Framework
+Group:      System/Sensor Framework
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1:       sensord.manifest
-Source2:       libsensord.manifest
+Source1:    sensord.service
+Source2:    sensord_command.socket
+Source3:    sensord_event.socket
+
 
 BuildRequires:  cmake
 BuildRequires:  libattr-devel
@@ -70,8 +72,6 @@ Sensor functional testing
 
 %prep
 %setup -q
-cp %{SOURCE1} .
-cp %{SOURCE2} .
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
@@ -89,6 +89,12 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
+mkdir -p %{buildroot}%{_libdir}/systemd/system/
+
+install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/
+install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/
+install -m 0644 %SOURCE3 %{buildroot}%{_libdir}/systemd/system/
+
 %install_service multi-user.target.wants sensord.service
 %install_service sockets.target.wants sensord_event.socket
 %install_service sockets.target.wants sensord_command.socket
@@ -108,7 +114,7 @@ ln -sf %{_libdir}/libsensor.so.%{version} %{_libdir}/libsensor.so.1
 
 %files
 %attr(0644,root,root)/usr/etc/virtual_sensors.xml
-%manifest sensord.manifest
+%manifest packaging/sensord.manifest
 %{_bindir}/sensord
 %{_unitdir}/sensord.service
 %{_unitdir}/sensord_command.socket
@@ -120,7 +126,7 @@ ln -sf %{_libdir}/libsensor.so.%{version} %{_libdir}/libsensor.so.1
 
 %files -n libsensord
 %defattr(-,root,root,-)
-%manifest libsensord.manifest
+%manifest packaging/libsensord.manifest
 %{_libdir}/libsensor.so.*
 %{_libdir}/libsensord-shared.so
 %license LICENSE.APLv2

diff --git a/systemd/sensord_command.socket b/packaging/sensord_command.socket
similarity index 100%
rename from systemd/sensord_command.socket
rename to packaging/sensord_command.socket

diff --git a/systemd/sensord_event.socket b/packaging/sensord_event.socket
similarity index 100%
rename from systemd/sensord_event.socket
rename to packaging/sensord_event.socket

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
deleted file mode 100644 (file)
index 64fbd69..0000000
--- a/systemd/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-INSTALL(FILES
-       ${CMAKE_CURRENT_SOURCE_DIR}/sensord.service
-       ${CMAKE_CURRENT_SOURCE_DIR}/sensord_command.socket
-       ${CMAKE_CURRENT_SOURCE_DIR}/sensord_event.socket
-       DESTINATION lib/systemd/system)
-