resetting manifest requested domain to floor

diff --git a/bluetooth-agent.manifest b/bluetooth-agent.manifest
deleted file mode 100644 (file)
index 49894f1..0000000
--- a/bluetooth-agent.manifest
+++ /dev/null
@@ -1,22 +0,0 @@
-<manifest>
-    <define>
-        <domain name="bt_agent"/>
-       <request>
-               <smack request="device::app_logging" type="w"/>
-               <smack request="device::sys_logging" type="w"/>
-               <smack request="system::vconf" type="rwxat"/>
-               <smack request="system::share" type="rwxat"/>
-               <smack request="sys-assert::core" type="rwxat"/>
-               <smack request="dbus" type="w"/>
-               <smack request="msg-service" type="rwx"/>
-               <smack request="msg-service::db" type="rw"/>
-               <smack request="contacts-service" type="wx"/>
-       </request>
-       <permit>
-               <smack permit="dbus" type="rwx"/>
-       </permit>
-    </define>
-    <request>
-        <domain name="bt_agent"/>
-    </request>
-</manifest>

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

diff --git a/packaging/bluetooth-agent.spec b/packaging/bluetooth-agent.spec
index 03b091e..046f9e0 100644 (file)
--- a/packaging/bluetooth-agent.spec
+++ b/packaging/bluetooth-agent.spec
@@ -5,6 +5,7 @@ Release:    2
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Source0:    %{name}-%{version}.tar.gz
+Source1001:    bluetooth-agent.manifest
 
 BuildRequires:  pkgconfig(contacts-service2)
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -21,6 +22,7 @@ Bluetooth agent packages that support various external profiles
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 cmake . -DCMAKE_INSTALL_PREFIX=/usr
@@ -32,7 +34,7 @@ rm -rf %{buildroot}
 %make_install
 
 %files
-%manifest bluetooth-agent.manifest
+%manifest %{name}.manifest
 %defattr(-, root, root)
 %{_bindir}/bluetooth-map-agent
 %{_bindir}/bluetooth-pb-agent