summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaekyun Lee <jkyun.lee@samsung.com>2013-04-12 16:16:42 +0900
committerJaekyun Lee <jkyun.lee@samsung.com>2013-04-18 17:28:51 +0900
commit4b4db9e87a4cfe67012202375c8b82317d0d501c (patch)
tree17f05434cc3e136c121e850766138e9b80515a58
parent61cdb469e239884055635e6de5c2bed21dacfb81 (diff)
downloadnfc-manager-neard-4b4db9e87a4cfe67012202375c8b82317d0d501c.tar.gz
nfc-manager-neard-4b4db9e87a4cfe67012202375c8b82317d0d501c.tar.bz2
nfc-manager-neard-4b4db9e87a4cfe67012202375c8b82317d0d501c.zip
Add DBus user and rename .service
- Add DBus user to launch nfc-manager-daemon - Rename .service to activation Change-Id: Ie41e9a6f682ba22f00817b11d973c962ce86831d
-rw-r--r--packaging/nfc-manager.spec2
-rw-r--r--src/manager/CMakeLists.txt2
-rw-r--r--src/manager/org.tizen.nfc_service.service (renamed from src/manager/nfc-manager.service)1
3 files changed, 3 insertions, 2 deletions
diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index 2043d02..6aa43f5 100644
--- 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
--- 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
index a9696a8..3287932 100644
--- 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