Merge with smack branch

Change-Id: I513a337b88e90c4afadfb0ef6d770ea935df5905

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index a765817..6e0613c
--- 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 tts DESTINATION /usr/share/license)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-server.rule DESTINATION  /etc/smack/accesses2.d)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-server.rule DESTINATION /opt/etc/smack/accesses.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/sysinfo-tts.xml DESTINATION /etc/config)

diff --git a/packaging/tts.spec b/packaging/tts.spec
old mode 100644 (file)
new mode 100755 (executable)
index 5690f34..f45b0fa
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -53,7 +53,7 @@ mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest tts-server.manifest
-/etc/smack/accesses2.d/tts-server.rule
+/opt/etc/smack/accesses.d/tts-server.rule
 /etc/config/sysinfo-tts.xml
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so