Remove hardcoded path for multiuser support

Bug-Tizen: PTREL-377

Change-Id: Idca798a975ccd0a7ec6aa419e1284ea58945b7ce
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/packaging/wrt-plugins-common.spec b/packaging/wrt-plugins-common.spec
index 486f927..dd89aba 100644 (file)
--- a/packaging/wrt-plugins-common.spec
+++ b/packaging/wrt-plugins-common.spec
@@ -20,9 +20,11 @@ BuildRequires: pkgconfig(libpcrecpp)
 BuildRequires: pkgconfig(icu-i18n)
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(cert-svc-vcore)
+BuildRequires: pkgconfig(libtzplatform-config)
 Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 BuildRequires: pkgconfig(wrt-commons-widget-interface-dao)
+Requires: libtzplatform-config
 
 %description
 JavaScript plugins for WebRuntime
@@ -73,15 +75,15 @@ rm -rf %{buildroot}
 
 %post
 mkdir -p %{_libdir}/wrt-plugins
-mkdir -p /usr/etc/wrt/injected-javascript
-touch /opt/share/widget/plugin-installation-required
+mkdir -p %TZ_SYS_WRT_CONF/injected-javascript
+touch %TZ_SYS_RW_WIDGET/plugin-installation-required
 /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
 %manifest %{name}.manifest
-/usr/etc/wrt-plugins/config.dtd
+%TZ_SYS_WRT_PLUGINS_CONF/config.dtd
 %{_libdir}/*.so
 %{_libdir}/*.so.*
 %{_libdir}/wrt-plugins/w3c-widget-interface/libwrt-plugins-w3c-widget-interface.so
@@ -89,15 +91,15 @@ touch /opt/share/widget/plugin-installation-required
 %attr(755,root,root) %{_bindir}/wrt-popup-wrt-runtime
 %attr(755,root,root) %{_bindir}/wrt-plugins-installer
 %{_datadir}/license/%{name}
-/etc/smack/accesses2.d/wrt-popup-ace-runtime.rule
-/etc/smack/accesses2.d/wrt-popup-wrt-runtime.rule
-/opt/etc/smack/accesses.d/wrt-popup-ace-runtime.rule
-/opt/etc/smack/accesses.d/wrt-popup-wrt-runtime.rule
+%{_sysconfdir}/smack/accesses2.d/wrt-popup-ace-runtime.rule
+%{_sysconfdir}/smack/accesses2.d/wrt-popup-wrt-runtime.rule
+%TZ_SYS_ETC/smack/accesses.d/wrt-popup-ace-runtime.rule
+%TZ_SYS_ETC/smack/accesses.d/wrt-popup-wrt-runtime.rule
 %if %{with_tests}
     %attr(755,root,root) %{_bindir}/widgetdb_tests_prepare_db.sh
     %attr(755,root,root) %{_bindir}/wrt-plugins-common-tests-widgetdb
 %endif
-/etc/ld.so.conf.d/wrt-plugins-common.conf
+%{_sysconfdir}/ld.so.conf.d/wrt-plugins-common.conf
 
 %files devel
 %manifest %{name}.manifest

diff --git a/src/plugins-installer/CMakeLists.txt b/src/plugins-installer/CMakeLists.txt
index 6c01a00..160aa4b 100644 (file)
--- a/src/plugins-installer/CMakeLists.txt
+++ b/src/plugins-installer/CMakeLists.txt
@@ -30,6 +30,7 @@ PKG_CHECK_MODULES(PLUGINS_INSTALLER_DEPS
     dpl-efl
     dpl-wrt-dao-rw
     libpcrecpp
+    libtzplatform-config
     REQUIRED
 )
 

diff --git a/tests/dao/widgetdb_tests_prepare_db.sh b/tests/dao/widgetdb_tests_prepare_db.sh
index 4776df8..2969a92 100755 (executable)
--- a/tests/dao/widgetdb_tests_prepare_db.sh
+++ b/tests/dao/widgetdb_tests_prepare_db.sh
@@ -16,7 +16,9 @@
 #
 #
 
-WRT_DB=/opt/dbspace/.wrt.db
+source /etc/tizen-platform.conf
+
+WRT_DB=$TZ_SYS_DB/.wrt.db
 WRT_DB_BCK=/tmp/wrt.db_backup
 
 if [ "x$1" == "xstart" ]; then