Add DBus user and rename .service

 - Add DBus user to launch nfc-manager-daemon
 - Rename .service to activation

Change-Id: Ie41e9a6f682ba22f00817b11d973c962ce86831d

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index 2043d02..6aa43f5 100644 (file)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -148,7 +148,7 @@ systemctl daemon-reload
 %{_prefix}/bin/nfc-manager-daemon
 %{_prefix}/bin/ndef-tool
 /etc/init.d/libnfc-manager-0
-/usr/share/dbus-1/services/nfc-manager.service
+%{_datadir}/dbus-1/services/org.tizen.nfc_service.service
 /usr/share/license/nfc-manager
 /usr/lib/systemd/system/nfc-manager.service
 /usr/lib/systemd/system/multi-user.target.wants/nfc-manager.service

diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index 5f50597..b1390b1 100644 (file)
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -71,7 +71,7 @@ ADD_EXECUTABLE(${NFC_MANAGER_DAEMON} ${MANAGER_SRCS})
 
 TARGET_LINK_LIBRARIES(${NFC_MANAGER_DAEMON} ${manager_pkges_LDFLAGS} "-lpthread -lrt -pie -ldl -L${CMAKE_CURRENT_SOURCE_DIR}/../../cmake_tmp/src/commonlib/ -lnfc-common-lib -L${CMAKE_CURRENT_SOURCE_DIR}/../../cmake_tmp/src/clientlib/ -lnfc")
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/nfc-manager.service DESTINATION share/dbus-1/services)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.nfc_service.service DESTINATION share/dbus-1/services)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sounds DESTINATION /usr/share/nfc-manager-daemon)
 INSTALL(TARGETS ${NFC_MANAGER_DAEMON} DESTINATION bin)
 

diff --git a/src/manager/nfc-manager.service b/src/manager/org.tizen.nfc_service.service
similarity index 88%
rename from src/manager/nfc-manager.service
rename to src/manager/org.tizen.nfc_service.service
index a9696a8..3287932 100644 (file)
--- a/src/manager/nfc-manager.service
+++ b/src/manager/org.tizen.nfc_service.service
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.tizen.nfc_service
 Exec=/usr/bin/nfc-manager-daemon
+User=root