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 9d3ed37..4d1532e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,5 +16,4 @@ ADD_SUBDIRECTORY(client)
 ## Server daemon ##
 ADD_SUBDIRECTORY(server)
 
-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-devel.manifest b/packaging/stt-devel.manifest
new file mode 100644 (file)
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/stt-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>

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

diff --git a/packaging/stt.spec b/packaging/stt.spec
index 8b756c9..04d8cec 100755 (executable)
--- a/packaging/stt.spec
+++ b/packaging/stt.spec
@@ -5,7 +5,8 @@ Release:    1
 Group:      UI Framework/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    stt.manifest
+Source1001:    %{name}.manifest
+Source1002:    %{name}-devel.manifest
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(ecore)
@@ -31,12 +32,12 @@ Speech To Text header files for STT development.
 
 
 %prep
-%setup -q 
-cp %{SOURCE1001} .
+%setup -q
+cp %{SOURCE1001} %{SOURCE1002} .
 
 
 %build
-%cmake . 
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
@@ -50,7 +51,6 @@ rm -rf %{buildroot}
 %files
 %manifest %{name}.manifest
 %license LICENSE.APLv2
-/opt/etc/smack/accesses.d/stt-server.rule
 /etc/config/sysinfo-stt.xml
 %defattr(-,root,root,-)
 %{_libdir}/libstt.so
@@ -59,7 +59,7 @@ rm -rf %{buildroot}
 %{_bindir}/stt-daemon
 
 %files devel
-%manifest %{name}.manifest
+%manifest %{name}-devel.manifest
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/stt.pc
 %{_libdir}/pkgconfig/stt-setting.pc

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

diff --git a/stt-server.rule b/stt-server.rule
deleted file mode 100644 (file)
index 6aadbe6..0000000
--- a/stt-server.rule
+++ /dev/null
@@ -1,13 +0,0 @@
-stt-server system::homedir rwx
-stt-server device::app_logging wx
-stt-server dbus rw
-stt-server system::vconf rwx
-stt-server system::share rwx
-stt-server location_fw::db rw
-stt-server system::use_internet rw
-stt-server sound_server rw
-stt-server mdm-server w
-stt-server pulseaudio rwx
-system::use_internet stt-server w
-stt-server tts-server rwx
-stt-server sys-assert::core rwxat