From 1b3b0537f53d9acf6fe14f12579a0fa3f304be64 Mon Sep 17 00:00:00 2001
From: "Sabera Djelti (sdi2)" <sabera.djelti@open.eurogiciel.org>
Date: Tue, 11 Feb 2014 11:18:06 +0100
Subject: [PATCH] Remove hardcoded path for multiuser support

Bug-Tizen: PTREL-392

Change-Id: I48db83c1685c897c3154cf8c8201a76c08998ef2
Signed-off-by: Sabera Djelti (sdi2) <sabera.djelti@open.eurogiciel.org>
---
 packaging/lbs-dbus.spec                                      | 6 +++---
 server/CMakeLists.txt                                        | 2 ++
 server/res/{lbs-dbus-server.conf => lbs-dbus-server.conf.in} | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename server/res/{lbs-dbus-server.conf => lbs-dbus-server.conf.in} (99%)

diff --git a/packaging/lbs-dbus.spec b/packaging/lbs-dbus.spec
index 84a8509..92a760b 100644
--- a/packaging/lbs-dbus.spec
+++ b/packaging/lbs-dbus.spec
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  python
 BuildRequires:  python-xml
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 LBS dbus interface
@@ -38,10 +39,9 @@ LBS client API library (devel)
 %setup -q
 cp %{SOURCE1001} .
 
-
 %build
-%cmake . 
-
+%cmake . \
+-DTZ_SYS_USER_GROUP=%TZ_SYS_USER_GROUP
 
 make %{?jobs:-j%jobs}
 
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index e742568..283d2b3 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -22,6 +22,8 @@ ADD_LIBRARY(lbs-dbus-server SHARED ${SRCS_S})
 TARGET_LINK_LIBRARIES(lbs-dbus-server ${pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(lbs-dbus-server PROPERTIES VERSION 0.1.0 SOVERSION 0 OUTPUT_NAME lbs-dbus-server)
 
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/res/lbs-dbus-server.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/res/lbs-dbus-server.conf)
+
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/lbs-dbus-server.conf DESTINATION ${SYSCONFDIR}/dbus-1/system.d)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/lbs_dbus_server.h DESTINATION include/lbs-dbus)
 INSTALL(TARGETS lbs-dbus-server DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime)
diff --git a/server/res/lbs-dbus-server.conf b/server/res/lbs-dbus-server.conf.in
similarity index 99%
rename from server/res/lbs-dbus-server.conf
rename to server/res/lbs-dbus-server.conf.in
index 83f6ff1..a9c5323 100644
--- a/server/res/lbs-dbus-server.conf
+++ b/server/res/lbs-dbus-server.conf.in
@@ -24,7 +24,7 @@
 		<allow receive_interface="org.tizen.lbs.Nmea"/>
 		<allow receive_interface="org.tizen.lbs.Satellite"/>
     </policy>
-    <policy user="app">
+    <policy group="@TZ_SYS_USER_GROUP@">
         <allow own="org.tizen.lbs"/>
 		<allow own="org.tizen.lbs.Manager"/>
 		<allow own="org.tizen.lbs.Providers.GpsManager"/>
-- 
2.7.4