resetting manifest requested domain to floor

diff --git a/calendar-service.manifest b/calendar-service.manifest
deleted file mode 100644 (file)
index 1a2b331..0000000
--- a/calendar-service.manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-<manifest>
-       <define>
-               <domain name="calendar-service"/>
-               <provide>
-                       <label name="calendar-service::initdb" />
-                       <label name="calendar-service::db" />
-               </provide>
-       </define>
-       <assign>
-               <filesystem path="/usr/lib/libcalendar-service2.so.0.1.15" label="_" />
-               <filesystem path="/usr/lib/libcalendar-service2.so.0" label="_" />
-               <filesystem path="/usr/lib/libcalendar-service2.so" label="_" />
-               <filesystem path="/etc/rc.d/init.d/calendar-serviced.sh" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc3.d/S85calendar-serviced" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc5.d/S85calendar-serviced" label="_" exec_label="none" />
-               <filesystem path="/opt/usr/dbspace/.calendar-svc.db" label="calendar-service::db" />
-               <filesystem path="/opt/usr/dbspace/.calendar-svc.db-journal" label="calendar-service::db" />
-               <filesystem path="/usr/lib/systemd/user/calendar.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/user/tizen-middleware.target.wants/calendar.service" label="_" exec_label="none" />
-       </assign>
-       <request>
-               <domain name="calendar-service" />
-       </request>
-</manifest>

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

diff --git a/packaging/calendar-service.spec b/packaging/calendar-service.spec
index 5b2ce37..beef873 100644 (file)
--- a/packaging/calendar-service.spec
+++ b/packaging/calendar-service.spec
@@ -6,6 +6,7 @@ Group:      System/Libraries
 License:    Apache 2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    calendar.service
+Source1001:    calendar-service.manifest
 Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/sqlite3, /bin/chown
 Requires(postun): /sbin/ldconfig
@@ -38,6 +39,7 @@ DB library for calendar (developement files)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 
 %build
@@ -76,7 +78,7 @@ chmod 660 /opt/usr/data/calendar-svc/.CALENDAR_SVC_*
 %postun -p /sbin/ldconfig
 
 %files
-%manifest calendar-service.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 #%{_libdir}/libcalendar-service-native.so.*
 %{_bindir}/calendar-serviced*
@@ -94,6 +96,7 @@ chmod 660 /opt/usr/data/calendar-svc/.CALENDAR_SVC_*
 %{_unitdir_user}/tizen-middleware.target.wants/calendar.service
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/calendar-service/*.h
 %{_includedir}/calendar-service2/*.h