Merge with smack branch

Change-Id: I3b3fb108745ed30411e045681a2522dfbe6233a3

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index c1191cd..09f305d
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,5 +17,5 @@ ADD_SUBDIRECTORY(client)
 ADD_SUBDIRECTORY(server)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 RENAME stt DESTINATION /usr/share/license)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/stt-server.rule DESTINATION  /etc/smack/accesses2.d)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/stt-server.rule DESTINATION  /opt/etc/smack/accesses.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/sysinfo-stt.xml DESTINATION /etc/config)

diff --git a/packaging/stt.spec b/packaging/stt.spec
old mode 100644 (file)
new mode 100755 (executable)
index 3c06b47..de443d3
--- a/packaging/stt.spec
+++ b/packaging/stt.spec
@@ -50,7 +50,7 @@ mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest stt-server.manifest
-/etc/smack/accesses2.d/stt-server.rule
+/opt/etc/smack/accesses.d/stt-server.rule
 /etc/config/sysinfo-stt.xml
 %defattr(-,root,root,-)
 %{_libdir}/libstt.so