Fix Multiuser packaging

Bug-Tizen: PTREL-368

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

diff --git a/bt-share/CMakeLists.txt b/bt-share/CMakeLists.txt
index 259b46e..326d182 100644 (file)
--- a/bt-share/CMakeLists.txt
+++ b/bt-share/CMakeLists.txt
@@ -47,5 +47,5 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -L${CMAKE_CURRENT_SOURCE_D
 
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/bluetooth-share.rule DESTINATION /opt/etc/smack/accesses.d)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/bluetooth-share.rule DESTINATION ${TZ_SYS_ETC}/smack/accesses.d)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/org.bluetooth.share.service DESTINATION share/dbus-1/system-services)

diff --git a/packaging/bluetooth-share.spec b/packaging/bluetooth-share.spec
index 0ec14ac..dc280d8 100644 (file)
--- a/packaging/bluetooth-share.spec
+++ b/packaging/bluetooth-share.spec
@@ -60,7 +60,8 @@ cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} .
 export CFLAGS+=" -fpie -fvisibility=hidden"
 export LDFLAGS+=" -Wl,--rpath=/usr/%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
 
-%cmake .
+%cmake . \
+       -DTZ_SYS_ETC=%{TZ_SYS_ETC}
 make
 
 %install
@@ -78,7 +79,7 @@ install -D -m 0755 %{SOURCE1004} %{buildroot}%{TZ_SYS_SHARE}/%{name}/ressources/
 
 %files
 %manifest %{name}.manifest
-%{TZ_SYS_ETC}/smack/accesses.d/bluetooth-share.rule
+%config %{TZ_SYS_ETC}/smack/accesses.d/bluetooth-share.rule
 %defattr(-,root,root,-)
 %{_bindir}/bluetooth-share
 %{_datadir}/dbus-1/system-services/org.bluetooth.share.service