Fix .service and install it into dbus system service directory

In Tizen 3.0, dbus will running with an unprivileged user 'dbus' and use
an setuid servicehelper to activate system service, which should be
installed into the system-service directory if it provides system wide
service, and "User=" field is must to have to servicehelper.

Bug: https://bugs.tizen.org/jira/browse/PTREL-124
Change-Id: I28e400db73439b5c8695e515f834fdf01c973598
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>

diff --git a/configure.ac b/configure.ac
index 767711e..cc1254a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ DBUS_CONF_DIR="${sysconfdir}/dbus-1/system.d"
 AC_SUBST(DBUS_CONF_DIR)
 
 # Check DBus service path
-DBUS_SERVICES_DIR="/usr/share/dbus-1/services"
+DBUS_SERVICES_DIR="/usr/share/dbus-1/system-services"
 AC_SUBST(DBUS_SERVICES_DIR)
 AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBus is])
 

diff --git a/gps-manager/org.tizen.lbs.Providers.GpsManager.service.in b/gps-manager/org.tizen.lbs.Providers.GpsManager.service.in
index 79446c1..0f3883d 100644 (file)
--- a/gps-manager/org.tizen.lbs.Providers.GpsManager.service.in
+++ b/gps-manager/org.tizen.lbs.Providers.GpsManager.service.in
@@ -1,3 +1,4 @@
 [D-BUS Service]
 Name=org.tizen.lbs.Providers.GpsManager
 Exec=@libexecdir@/gps-manager
+User=root

diff --git a/packaging/gps-manager.spec b/packaging/gps-manager.spec
index e817bb7..721d3ab 100644 (file)
--- a/packaging/gps-manager.spec
+++ b/packaging/gps-manager.spec
@@ -121,7 +121,7 @@ vconftool set -t double db/location/replay/ManualAltitude "0.0" -f
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 /usr/libexec/gps-manager
-/usr/share/dbus-1/services/org.tizen.lbs.Providers.GpsManager.service
+/usr/share/dbus-1/system-services/org.tizen.lbs.Providers.GpsManager.service
 /usr/share/lbs/gps-manager.provider
 /etc/rc.d/init.d/gps-manager
 /etc/rc.d/rc3.d/S90gps-manager