Install to system-wide dbus service directory

Change-Id: I4dfbec6e53abccac8849b6750d687d47ca73bdd2
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>

diff --git a/oma-dm-agent.manifest b/oma-dm-agent.manifest
index fef9302..9acbc0b 100755 (executable)
--- a/oma-dm-agent.manifest
+++ b/oma-dm-agent.manifest
@@ -39,7 +39,7 @@
                <filesystem path="/etc/rc.d/rc3.d/S91oma-dm-agent" label="_" exec_label="none"/>
                <filesystem path="/etc/rc.d/rc5.d/S91oma-dm-agent" label="_" exec_label="none"/>
                <filesystem path="/etc/init.d/oma-dm" label="_" exec_label="none"/>
-               <filesystem path="/usr/share/dbus-1/services/com.samsung.omadmagent.service" label="_"/>
+               <filesystem path="/usr/share/dbus-1/system-services/com.samsung.omadmagent.service" label="_"/>
        </assign>
        <request>
                <domain name="oma-dm-agent" />

diff --git a/packaging/oma-dm-agent.changes b/packaging/oma-dm-agent.changes
index 072abc8..333a6ba 100644 (file)
--- a/packaging/oma-dm-agent.changes
+++ b/packaging/oma-dm-agent.changes
@@ -1,4 +1,7 @@
 Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com>
+- Install to system-wide dbus service directory, TDIST-295
+
+Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com>
 - Fix dbus service file: add "User" field
 
 Mon Aug 12 2013 Chengwei Yang <chengwei.yang@intel.com>

diff --git a/packaging/oma-dm-agent.spec b/packaging/oma-dm-agent.spec
index 0a53592..eeb4592 100755 (executable)
--- a/packaging/oma-dm-agent.spec
+++ b/packaging/oma-dm-agent.spec
@@ -134,7 +134,7 @@ rm -rf /usr/share/oma-dm-cfg
 
 %manifest oma-dm-agent.manifest
 %defattr(-,root,root,-)
-/usr/share/dbus-1/services/*
+/usr/share/dbus-1/system-services/com.samsung.omadmagent.service
 /usr/bin/oma-dm-agent
 
 /usr/share/oma-dm-cfg/ddf/*

diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt
index 0e9ea0f..4879927 100755 (executable)
--- a/src/agent/CMakeLists.txt
+++ b/src/agent/CMakeLists.txt
@@ -78,7 +78,7 @@ INSTALL(TARGETS ${EXENAME} DESTINATION ${BINDIR})
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/oma-dm-cfg DESTINATION /usr/share)
 
 # install oma ds dbus file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.service DESTINATION /usr/share/dbus-1/services)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.service DESTINATION /usr/share/dbus-1/system-services)
 
 # install booting script file
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/${PROJECT_NAME} DESTINATION /etc/init.d/)