resetting manifest requested domain to floor

diff --git a/libmm-sound.manifest b/libmm-sound.manifest
deleted file mode 100644 (file)
index db36e81..0000000
--- a/libmm-sound.manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-<manifest>
-       <define>
-               <domain name="sound_server"/>
-       </define>
-       <request>
-               <domain name="_"/>
-       </request>
-       <assign>
-               <filesystem path="/usr/bin/sound_server" label="sound_server" exec_label="sound_server"/>
-               <filesystem path="/etc/rc.d/init.d/soundserver" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc3.d/S23soundserver" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc4.d/S23soundserver" label="_" exec_label="none" />
-       </assign>
-</manifest>

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

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 7707913..cbad707 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -7,6 +7,7 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    sound-server.service
 Source2:    sound-server.path
+Source1001:    libmm-sound.manifest
 Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/vconftool
 Requires(postun): /sbin/ldconfig
@@ -53,6 +54,7 @@ MMSound utility package - contians mm_sound_testsuite, sound_check for sound sys
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 
 %build
@@ -104,7 +106,7 @@ ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4
 
 
 %files
-%manifest libmm-sound.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/sound_server
 %{_libdir}/libmmfsound.so.*
@@ -125,6 +127,7 @@ ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4
 %{_libdir}/systemd/system/sound-server.path
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libmmfkeysound.so
 %{_libdir}/libmmfsound.so
@@ -135,11 +138,13 @@ ln -s %{_sysconfdir}/rc.d/init.d/soundserver %{buildroot}%{_sysconfdir}/rc.d/rc4
 
 
 %files sdk-devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/mmf/mm_sound.h
 %{_libdir}/pkgconfig/mm-keysound.pc
 %{_libdir}/pkgconfig/mm-sound.pc
 
 %files tool
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/mm_sound_testsuite