resetting manifest requested domain to floor

diff --git a/media-server.manifest b/media-server.manifest
deleted file mode 100644 (file)
index 9c68207..0000000
--- a/media-server.manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-<manifest>
-       <define>
-               <domain name="media-server" policy="restricted" plist="media-thumbnail-server, media-data"/>
-               <request>
-                       <smack request="system::media" type="rwxat"/>
-               </request>
-       </define>
-       <request>
-               <domain name="_"/>
-       </request>
-       <assign>
-               <filesystem path="/usr/bin/media-server" label="media-server" exec_label="media-server" />
-               <filesystem path="/usr/bin/media-scanner" label="media-server" exec_label="media-server" />
-               <filesystem path="/usr/bin/mediadb-update" label="media-server" exec_label="media-server" />
-               <filesystem path="/etc/rc.d/init.d/mediasvr" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc3.d/S99mediasvr" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc5.d/S99mediasvr" label="_" exec_label="none" />
-       </assign>
-</manifest>
-

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

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index c07aceb..7d425d9 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -6,6 +6,7 @@ Group:      Multimedia/Service
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    media-server.service
+Source1001:    media-server.manifest
 
 Requires(post): /usr/bin/vconftool
 BuildRequires:  pkgconfig(glib-2.0)
@@ -41,6 +42,7 @@ Description: media server development library.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 
@@ -68,6 +70,7 @@ vconftool set -t int file/private/mediaserver/scan_directory "1" -f
 %postun -n libmedia-utils -p /sbin/ldconfig
 
 %files
+%manifest %{name}.manifest
 #%manifest media-server.manifest
 %defattr(-,root,root,-)
 %{_bindir}/media-server
@@ -82,6 +85,7 @@ vconftool set -t int file/private/mediaserver/scan_directory "1" -f
 
 
 %files -n libmedia-utils
+%manifest %{name}.manifest
 %license LICENSE.APLv2.0
 #%manifest libmedia-utils.manifest
 %defattr(-,root,root,-)
@@ -89,6 +93,7 @@ vconftool set -t int file/private/mediaserver/scan_directory "1" -f
 %{_libdir}/libmedia-utils.so.0.0.0
 
 %files -n libmedia-utils-devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libmedia-utils.so
 %{_libdir}/pkgconfig/libmedia-utils.pc