resetting manifest requested domain to floor

diff --git a/nfc-manager.manifest b/nfc-manager.manifest
deleted file mode 100644 (file)
index 91cb318..0000000
--- a/nfc-manager.manifest
+++ /dev/null
@@ -1,30 +0,0 @@
-<manifest>
-       <define>
-               <domain name="nfc-manager" />
-               <provide>
-                       <label name="nfc-manager::tag" />
-                       <label name="nfc-manager::p2p" />
-                       <label name="nfc-manager::admin" />
-                       <label name="nfc-manager::card_emul" />
-                       <label name="nfc-manager::common" />
-               </provide>
-               <request>
-                       <smack request="sys-assert::core" type="rwxat" />
-               </request>
-       </define>
-       <assign>
-               <filesystem path="/usr/bin/nfc-manager-daemon" exec_label="nfc-manager" />
-               <filesystem path="/etc/init.d/libnfc-manager-0" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc3.d/S81libnfc-manager-0" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc5.d/S81libnfc-manager-0" label="_" exec_label="none" />
-               <filesystem path="/usr/bin/ndef-tool" exec_label="nfc-manager" />
-               <filesystem path="/usr/lib/systemd/system/nfc-manager.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/nfc-manager.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/libnfc.so.1.0.0" label="_" />
-               <filesystem path="/usr/lib/libnfc.so.1" label="_" />
-       </assign>
-       <request>
-               <domain name="nfc-manager" />
-       </request>
-</manifest>
-

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

diff --git a/packaging/nfc-manager.spec b/packaging/nfc-manager.spec
index 4a3d9da..d78273a 100644 (file)
--- a/packaging/nfc-manager.spec
+++ b/packaging/nfc-manager.spec
@@ -7,6 +7,7 @@ License:    Flora Software License
 Source0:    %{name}-%{version}.tar.gz
 Source1:    libnfc-manager-0.init.in
 Source2:    nfc-manager.service
+Source1001:    nfc-manager.manifest
 Requires:   sys-assert
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(glib-2.0)
@@ -44,6 +45,7 @@ NFC library Manager.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 
 %package devel
@@ -143,7 +145,7 @@ systemctl daemon-reload
 
 
 %files
-%manifest nfc-manager.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libnfc.so.1
 %{_libdir}/libnfc.so.1.0.0
@@ -157,7 +159,7 @@ systemctl daemon-reload
 
 
 %files devel
-%manifest nfc-manager-devel.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/nfc.pc
 %{_includedir}/nfc/*.h
@@ -165,7 +167,7 @@ systemctl daemon-reload
 
 
 %files -n nfc-common-lib
-%manifest nfc-common-lib.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libnfc-common-lib.so.1
 %{_libdir}/libnfc-common-lib.so.1.0.0
@@ -174,7 +176,7 @@ systemctl daemon-reload
 
 
 %files -n nfc-common-lib-devel
-%manifest nfc-common-lib-devel.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libnfc-common-lib.so
 %{_libdir}/pkgconfig/nfc-common-lib.pc