Fix manifests

put manifests in packaging/
consistent use of %{name} macros

Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e0613c..2b63418 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,5 +17,4 @@ 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 /opt/etc/smack/accesses.d)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/sysinfo-tts.xml DESTINATION /etc/config)

diff --git a/packaging/tts-devel.manifest b/packaging/tts-devel.manifest
new file mode 100644 (file)
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/tts-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>

diff --git a/packaging/tts.manifest b/packaging/tts.manifest
index 017d22d..c00c25b 100644 (file)
--- a/packaging/tts.manifest
+++ b/packaging/tts.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>

diff --git a/packaging/tts.spec b/packaging/tts.spec
index a69ad5c..af137b2 100755 (executable)
--- a/packaging/tts.spec
+++ b/packaging/tts.spec
@@ -5,7 +5,8 @@ Release:    1
 Group:      libs
 License:    Samsung
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    tts.manifest
+Source1001:    %{name}.manifest
+Source1002:    %{name}-devel.manifest
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(glib-2.0)
@@ -37,7 +38,7 @@ Text To Speech header files for TTS development.
 
 %prep
 %setup -q -n %{name}-%{version}
-cp %{SOURCE1001} .
+cp %{SOURCE1001} %{SOURCE1002} .
 
 
 %build
@@ -55,7 +56,6 @@ mkdir -p %{buildroot}/usr/share/license
 
 %files
 %manifest %{name}.manifest
-/opt/etc/smack/accesses.d/tts-server.rule
 /etc/config/sysinfo-tts.xml
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
@@ -64,7 +64,7 @@ mkdir -p %{buildroot}/usr/share/license
 /usr/share/license/*
 
 %files devel
-%manifest %{name}.manifest
+%manifest %{name}-devel.manifest
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/tts.pc
 %{_libdir}/pkgconfig/tts-setting.pc

diff --git a/tts-server.manifest b/tts-server.manifest
deleted file mode 100644 (file)
index 4928d08..0000000
--- a/tts-server.manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-<manifest>
-        <define> 
-                <domain name="tts-server" policy="shared"/>
-        </define>
-       <assign>
-               <filesystem path="/usr/lib/libtts.so" label="_"/>
-               <filesystem path="/usr/lib/libtts_setting.so" label="_"/>
-       </assign>
-        <request>
-                <domain name="tts-server" />
-        </request>
-</manifest>

diff --git a/tts-server.rule b/tts-server.rule
deleted file mode 100644 (file)
index b72dfbf..0000000
--- a/tts-server.rule
+++ /dev/null
@@ -1,12 +0,0 @@
-tts-server device::app_logging wx
-tts-server tts-engine-samsung::vdata rx
-tts-server system::vconf rwxat
-tts-server sound_server rw
-tts-server system::share rwxat
-tts-server pulseaudio rwxat
-tts-server dbus rw
-tts-server mdm-server w
-tts-server system::use_internet rw
-system::use_internet tts-server w
-tts-server stt-server rwx
-tts-server sys-assert::core rwxat