Add multi-user support

Also remove creation of "/opt/usr/share/nfc_debug" since it doesn't
seem to be used.

Bug-Tizen: PTREL-373
Change-Id: I76dbf7712b7e4b79019fcbc89905f8636a0e7503
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index cf5ab28..e402577 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(NFC_CLIENT "nfc")
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} CLIENT_SRCS)
 
-pkg_check_modules(client_pkgs REQUIRED security-server dlog ecore-x vconf)
+pkg_check_modules(client_pkgs REQUIRED security-server dlog ecore-x vconf libtzplatform-config)
 
 FOREACH(flag ${client_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 978b0ec..52f958d 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -13,7 +13,7 @@ EXEC_PROGRAM(${GDBUS_CODEGEN} ARGS
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} COMMON_SRCS)
 
 pkg_check_modules(common_pkgs REQUIRED glib-2.0 gio-2.0 gio-unix-2.0 dlog bluetooth-api
-       libssl)
+       libssl libtzplatform-config)
 
 FOREACH(flag ${common_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/common/net_nfc_util_defines.h b/common/net_nfc_util_defines.h
index 3f87408..2be9279 100644 (file)
--- a/common/net_nfc_util_defines.h
+++ b/common/net_nfc_util_defines.h
@@ -24,6 +24,6 @@
 #define CONN_HANDOVER_WIFI_IBSS_CARRIER_MIME_NAME "application/vnd.wfa.wsc;mode=ibss"
 
 #define BLUETOOTH_ADDRESS_LENGTH 6
-#define HIDDEN_BT_ADDR_FILE "/opt/etc/.bd_addr"
+#define HIDDEN_BT_ADDR_FILE tzplatform_mkpath(TZ_SYS_ETC, ".bd_addr")
 
 #endif //__NET_NFC_UTIL_DEFINES_H__

diff --git a/common/net_nfc_util_internal.h b/common/net_nfc_util_internal.h
index b5934fa..6dfe3ef 100644 (file)
--- a/common/net_nfc_util_internal.h
+++ b/common/net_nfc_util_internal.h
@@ -20,9 +20,12 @@
 #include <libgen.h>
 #include <netinet/in.h>
 
+/* For multi-user support */
+#include <tzplatform_config.h>
+
 #include "net_nfc_typedef_internal.h"
 
-#define NET_NFC_MANAGER_DATA_PATH              "/opt/data/nfc-manager-daemon"
+#define NET_NFC_MANAGER_DATA_PATH                      tzplatform_mkpath(TZ_SYS_DATA, "nfc-manager-daemon")
 #define NET_NFC_MANAGER_DATA_PATH_MESSAGE      "message"
 #define NET_NFC_MANAGER_NDEF_FILE_NAME         "ndef-message.txt"
 

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 997ed12..b30486c 100755 (executable)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -9,11 +9,12 @@ FILE(GLOB DAEMON_SRCS *.c)
 IF(ARM_TARGET)
        pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0 security-server
                vconf dlog tapi appsvc libcurl bluetooth-api libssl svi capi-media-wav-player
-               pkgmgr pkgmgr-info capi-network-wifi ecore-x pmapi wifi-direct)
+               pkgmgr pkgmgr-info capi-network-wifi ecore-x pmapi wifi-direct
+               libtzplatform-config)
 ELSE(ARM_TARGET)
        pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0 security-server
                vconf dlog tapi appsvc libcurl bluetooth-api libssl svi capi-media-wav-player
-               pkgmgr pkgmgr-info capi-network-wifi ecore-x pmapi)
+               pkgmgr pkgmgr-info capi-network-wifi ecore-x pmapi libtzplatform-config)
 ENDIF(ARM_TARGET)
 
 FOREACH(flag ${daemon_pkgs_CFLAGS})

diff --git a/daemon/net_nfc_server_util.h b/daemon/net_nfc_server_util.h
index 3823c6c..bd0016f 100644 (file)
--- a/daemon/net_nfc_server_util.h
+++ b/daemon/net_nfc_server_util.h
@@ -17,10 +17,14 @@
 #define __NET_NFC_SERVER_UTIL_H__
 
 #include <aul.h>
+
+/* For multi-user support */
+#include <tzplatform_config.h>
+
 #include "net_nfc_typedef_internal.h"
 
 #ifndef MESSAGE_STORAGE
-#define MESSAGE_STORAGE "/opt/share/service/nfc-manager"
+#define MESSAGE_STORAGE tzplatform_mkpath(TZ_SYS_SHARE, "service/nfc-manager")
 #endif
 
 typedef enum

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index 3c3eb5a..f3d34e4 100755 (executable)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -1,37 +1,38 @@
 Name:       nfc-manager
 Summary:    NFC framework manager
-Version:       0.1.6
+Version:    0.1.6
 Release:    0
 Group:      Network & Connectivity/NFC
 License:    Flora
 Source0:    %{name}-%{version}.tar.gz
 Source1:    %{name}.service
-Source1001:    %{name}.manifest
-BuildRequires: cmake
-BuildRequires: pkgconfig(aul)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(security-server)
-BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(tapi)
-BuildRequires: pkgconfig(bluetooth-api)
-BuildRequires: pkgconfig(capi-network-wifi)
-BuildRequires: pkgconfig(mm-sound)
-BuildRequires: pkgconfig(appsvc)
-BuildRequires: pkgconfig(svi)
-BuildRequires: pkgconfig(capi-media-wav-player)
-BuildRequires: pkgconfig(libssl)
-BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(pkgmgr)
-BuildRequires: pkgconfig(pkgmgr-info)
-BuildRequires: pkgconfig(ecore-x)
-BuildRequires: pkgconfig(pmapi)
-BuildRequires: python
-BuildRequires: python-xml
-BuildRequires: gettext-tools
+Source1001: %{name}.manifest
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(aul)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(security-server)
+BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(tapi)
+BuildRequires:  pkgconfig(bluetooth-api)
+BuildRequires:  pkgconfig(capi-network-wifi)
+BuildRequires:  pkgconfig(mm-sound)
+BuildRequires:  pkgconfig(appsvc)
+BuildRequires:  pkgconfig(svi)
+BuildRequires:  pkgconfig(capi-media-wav-player)
+BuildRequires:  pkgconfig(libssl)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(pkgmgr)
+BuildRequires:  pkgconfig(pkgmgr-info)
+BuildRequires:  pkgconfig(ecore-x)
+BuildRequires:  pkgconfig(pmapi)
+BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  python
+BuildRequires:  python-xml
+BuildRequires:  gettext-tools
 %ifarch %arm
-BuildRequires: pkgconfig(wifi-direct)
+BuildRequires:  pkgconfig(wifi-direct)
 %global ARM_DEF "-DARM_TARGET=Y"
 %endif
 
@@ -97,8 +98,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %install
 %make_install
 
-mkdir -p %{buildroot}/opt/usr/share/nfc_debug
-
 mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
 cp -af %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
 ln -s ../%{name}.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/%{name}.service
@@ -114,11 +113,12 @@ fi
 
 %post -n nfc-client-lib
 /sbin/ldconfig
-vconftool set -t bool db/nfc/feature 0 -u 5000 -f
-vconftool set -t bool db/nfc/predefined_item_state 0 -u 5000 -f
-vconftool set -t string db/nfc/predefined_item "None" -u 5000 -f
-vconftool set -t bool db/nfc/enable 0 -u 5000 -f
-vconftool set -t int db/nfc/se_type 0 -u 5000 -f
+USER_GROUP_ID=$(getent group %{TZ_SYS_USER_GROUP} | cut -d: -f3)
+vconftool set -t bool db/nfc/feature 0 -g $USER_GROUP_ID -f
+vconftool set -t bool db/nfc/predefined_item_state 0 -g $USER_GROUP_ID -f
+vconftool set -t string db/nfc/predefined_item "None" -g $USER_GROUP_ID -f
+vconftool set -t bool db/nfc/enable 0 -g $USER_GROUP_ID -f
+vconftool set -t int db/nfc/se_type 0 -g $USER_GROUP_ID -f
 
 %postun
 /sbin/ldconfig
@@ -141,7 +141,6 @@ systemctl daemon-reload
 %{_datadir}/dbus-1/system-services/org.tizen.NetNfcService.service
 %{_datadir}/packages/%{name}.xml
 %{_datadir}/nfc-manager-daemon/sounds/*
-%attr(0775,-,5000) %dir /opt/usr/share/nfc_debug
 %license LICENSE.Flora