resetting manifest requested domain to floor

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

diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index 3e74e01..8756669 100644 (file)
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -6,6 +6,7 @@ Group:      System/Telephony
 License:    Apache
 Source0:    %{name}-%{version}.tar.gz
 Source1:    telephony.service
+Source1001:    telephony-daemon.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
@@ -17,6 +18,7 @@ Description: Telephony daemon
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %cmake . -DVERSION=%{version}
@@ -30,7 +32,7 @@ ln -s ../telephony.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.
 mkdir -p %{buildroot}/usr/share/license
 
 %files
-%manifest telephony-daemon.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_bindir}/telephony-daemon
 %{_sysconfdir}/rc.d/init.d/telephony-daemon

diff --git a/telephony-daemon.manifest b/telephony-daemon.manifest
deleted file mode 100644 (file)
index 64c6387..0000000
--- a/telephony-daemon.manifest
+++ /dev/null
@@ -1,29 +0,0 @@
-<manifest>
-       <define>
-               <domain name="telephony_framework"/>
-               <provide>
-                       <label name="telephony_framework::db"/>
-                       <label name="telephony_framework::api_manager"/>
-                       <label name="telephony_framework::api_call"/>
-                       <label name="telephony_framework::api_gps"/>
-                       <label name="telephony_framework::api_modem"/>
-                       <label name="telephony_framework::api_network"/>
-                       <label name="telephony_framework::api_phonebook"/>
-                       <label name="telephony_framework::api_sap"/>
-                       <label name="telephony_framework::api_sat"/>
-                       <label name="telephony_framework::api_sim"/>
-                       <label name="telephony_framework::api_sms"/>
-                       <label name="telephony_framework::api_ss"/>
-               </provide>
-       </define>
-       <assign>
-               <filesystem path="/etc/rc.d/init.d/telephony-daemon" label="_" exec_label="none"/>
-               <filesystem path="/etc/rc.d/rc3.d/S30telephony-daemon" label="_" exec_label="none"/>
-               <filesystem path="/etc/rc.d/rc5.d/S30telephony-daemon" label="_" exec_label="none"/>
-               <filesystem path="/usr/lib/systemd/system/telephony.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/telephony.service" label="_" exec_label="none" />
-       </assign>
-       <request>
-               <domain name="telephony_framework"/>
-       </request>
-</manifest>