Fix manifests by using floor domain.

Change-Id: I8a8076965cf5de80ffd2785148f0b3336fcf0fc8
Signed-off-by: Junfeng Dong <junfeng.dong@intel.com>

diff --git a/contacts-service2.manifest b/contacts-service2.manifest
deleted file mode 100644 (file)
index 4ee00ed..0000000
--- a/contacts-service2.manifest
+++ /dev/null
@@ -1,55 +0,0 @@
-<manifest>
-       <define>
-               <domain name="contacts-service" />
-               <provide>
-                       <label name="contacts-service::db"/>
-                       <label name="contacts-service::svc"/>
-                       <label name="contacts-service::phonelog"/>
-                       <label name="contacts-service::vconf"/>
-                       <label name="contacts-service::vconf-private"/>
-               </provide>
-               <request>
-                       <smack request="sys-assert::core" type="rwxat"/>
-                       <smack request="libaccounts-svc::db" type="rw"/>
-                       <smack request="telephony_framework::api_sim" type="r"/>
-                       <smack request="telephony_framework::api_phonebook" type="rx"/>
-                       <smack request="system::vconf_system" type="r"/>
-                       <smack request="system::vconf_inhouse" type="r"/>
-               </request>
-       </define>
-       <assign>
-               <filesystem path="/usr/lib/libcontacts-service2.so.0.9.84.2" label="_"/>
-               <filesystem path="/usr/lib/libcontacts-service2.so.0" label="_"/>
-               <filesystem path="/opt/usr/dbspace/.contacts-svc.db" label="contacts-service::db"/>
-               <filesystem path="/opt/usr/dbspace/.contacts-svc.db-journal" label="contacts-service::db"/>
-               <filesystem path="/usr/lib/systemd/user/contacts-service.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service" label="_" exec_label="none" />
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_AB_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_ACTIVITY_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_ADDRESS_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_COMPANY_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_DATA_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_DB_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_EMAIL_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_EVENT_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_GROUP_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_GROUP_RELATION_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_IMAGE_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_MESSENGER_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_MY_PROFILE_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_NAME_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_NICKNAME_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_NUMBER_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_NOTE_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_PERSON_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_PROFILE_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_RELATIONSHIP_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_SDN_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_SPEED_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_URL_CHANGED" label="contacts-service::svc"/>
-               <filesystem path="/opt/usr/data/contacts-svc/.CONTACTS_SVC_PLOG_CHANGED" label="contacts-service::phonelog"/>
-       </assign>
-       <request>
-               <domain name="contacts-service" />
-       </request>
-</manifest>

diff --git a/packaging/contacts-service.spec b/packaging/contacts-service.spec
index 8725791..1d2b2b9 100644 (file)
--- a/packaging/contacts-service.spec
+++ b/packaging/contacts-service.spec
@@ -7,6 +7,7 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    contacts-service.service
 Source2:    contacts-service.socket
+Source3:    contacts-service2.manifest
 BuildRequires:  cmake
 BuildRequires:  vconf-keys-devel
 BuildRequires:  pkgconfig(db-util)
@@ -53,6 +54,7 @@ New Contacts Service Library (devel)
 
 %prep
 %setup -q
+cp %{SOURCE3} .
 
 
 %build

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