Updated manifest and removed chsmack from scripts.

Change-Id: I9b425b182b007305e17bf56e0df682f5b7966444

6 files changed, 36 insertions, 27 deletions

diff --git a/packaging/capi-security-privacy-manager-devel.manifest b/packaging/capi-security-privacy-manager-devel.manifest
new file mode 100644
index 0000000..75b0fa5
--- /dev/null
+++ b/packaging/capi-security-privacy-manager-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+    <request>
+        <domain name="_"/>
+    </request>
+</manifest>
diff --git a/packaging/privacy-manager-client-devel.manifest b/packaging/privacy-manager-client-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/privacy-manager-client-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/privacy-manager-server-devel.manifest b/packaging/privacy-manager-server-devel.manifest
new file mode 100644
index 0000000..c00c25b
--- /dev/null
+++ b/packaging/privacy-manager-server-devel.manifest
@@ -0,0 +1,5 @@
+<manifest>
+        <request>
+                <domain name="_" />
+        </request>
+</manifest>
diff --git a/packaging/privacy-manager-server.manifest b/packaging/privacy-manager-server.manifest
index 4bbd7a7..c00c25b 100644
--- a/packaging/privacy-manager-server.manifest
+++ b/packaging/privacy-manager-server.manifest
@@ -1,22 +1,5 @@
 <manifest>
-        <define>
-                <domain name="privacy-manager" />
-                <provide>
-                        <label name="privacy-manager::daemon" />
-                        <label name="privacy-manager::db" />
-                </provide>
-        </define>
         <request>
-                <domain name="privacy-manager" />
+                <domain name="_" />
         </request>
-        <assign>
-		        <filesystem path="/usr/bin/privacy-manager-server" label="privacy-manager::daemon" exec_label="privacy-manager::daemon"/>
-		        <filesystem path="/usr/share/license/privacy-manager-server" label="_"/>
-		        <filesystem path="/etc/rc.d/init.d/privacy-manager-server.sh" label="_" exec_label="none"/>
-		        <filesystem path="/etc/rc.d/rc3.d/S10privacy-manager-server.sh" label="_" exec_label="none"/>
-		        <filesystem path="/etc/rc.d/rc5.d/S10privacy-manager-server.sh" label="_" exec_label="none"/>
-		        <filesystem path="/usr/lib/systemd/system/privacy-manager-server.service" label="_" exec_label="none" />
-		        <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/privacy-manager-server.service" label="_" exec_label="none" />
-		        <filesystem path="/opt/dbspace/.privacylist.db" label="privacy-manager::db" exec_label="none" />
-		</assign>
 </manifest>
diff --git a/packaging/privacy-manager.spec b/packaging/privacy-manager.spec
index fcded9b..af627d3 100755
--- a/packaging/privacy-manager.spec
+++ b/packaging/privacy-manager.spec
@@ -6,6 +6,13 @@ Group:   Security/Libraries
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz
 Source1: privacy-manager-server.service
+Source1001: privacy-manager-server.manifest
+Source1002: privacy-manager-server-devel.manifest
+Source1003: privacy-manager-client.manifest
+Source1004: privacy-manager-client-devel.manifest
+Source1005: capi-security-privacy-manager.manifest
+Source1006: capi-security-privacy-manager-devel.manifest
+Source1007: tizenprv00.privacy-popup.manifest
 BuildRequires: cmake
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires: pkgconfig(libxml-2.0)
@@ -89,6 +96,13 @@ The Privacy popup provides UI to set privacy information of application.
 %setup -q
 
 %build
+cp %{SOURCE1001} .
+cp %{SOURCE1002} .
+cp %{SOURCE1003} .
+cp %{SOURCE1004} .
+cp %{SOURCE1005} .
+cp %{SOURCE1006} .
+cp %{SOURCE1007} .
 #%{!?build_type:%define build_type "Release"}
 
 %cmake . -DPREFIX=%{_prefix} \
@@ -137,7 +151,7 @@ fi
 %files -n privacy-manager-server
 %license  LICENSE.APLv2
 %defattr(-,root,root,-)
-%manifest packaging/privacy-manager-server.manifest
+%manifest privacy-manager-server.manifest
 %{_bindir}/*
 %{_prefix}/lib/systemd/*
 /opt/dbspace/.privacylist.db
@@ -148,11 +162,12 @@ fi
 %files -n privacy-manager-client
 %license  LICENSE.APLv2
 %defattr(-,root,root,-)
-%manifest packaging/privacy-manager-client.manifest
+%manifest privacy-manager-client.manifest
 %{_libdir}/libprivacy-manager-client.so*
 /etc/package-manager/parserlib/libprivileges.so
 
 %files -n privacy-manager-client-devel
+%manifest privacy-manager-client-devel.manifest
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/pkgconfig/privacy-manager-client.pc
@@ -162,16 +177,17 @@ fi
 %files -n capi-security-privacy-manager
 %license  LICENSE.APLv2
 %{_libdir}/libcapi-security-privacy-manager.so.*
-%manifest packaging/capi-security-privacy-manager.manifest
+%manifest capi-security-privacy-manager.manifest
 
 %files -n capi-security-privacy-manager-devel
+%manifest capi-security-privacy-manager-devel.manifest
 %{_includedir}/privacymgr/*.h
 %{_libdir}/libcapi-security-privacy-manager.so
 %{_libdir}/pkgconfig/capi-security-privacy-manager.pc
 
 %files -n tizenprv00.privacy-popup
 %license  LICENSE.APLv2
-%manifest packaging/tizenprv00.privacy-popup.manifest
+%manifest tizenprv00.privacy-popup.manifest
 %defattr(-,root,root,-)
 /usr/bin/tizenprv00.privacy-popup
 /usr/share/packages/tizenprv00.privacy-popup.xml
diff --git a/res/usr/bin/privacy_manager_create_clean_db.sh b/res/usr/bin/privacy_manager_create_clean_db.sh
index 9931bf3..3a366c0 100755
--- a/res/usr/bin/privacy_manager_create_clean_db.sh
+++ b/res/usr/bin/privacy_manager_create_clean_db.sh
@@ -26,11 +26,6 @@ do
     chown 0:0 /opt/dbspace/.$name.db-journal
     chmod 664 /opt/dbspace/.$name.db
     chmod 664 /opt/dbspace/.$name.db-journal
-    if [ -f /usr/lib/rpm-plugins/msm.so ]
-    then
-        chsmack -a "privacy-manager::db" /opt/dbspace/.$name.db
-        chsmack -a "privacy-manager::db" /opt/dbspace/.$name.db-journal
-    fi
 done