From a7e9698a07db83aa69f7678ec612255c13389e51 Mon Sep 17 00:00:00 2001
From: Jinmook Lim <jinmook.lim@samsung.com>
Date: Tue, 9 Jul 2013 19:56:04 +0900
Subject: [PATCH] Change a smack file from manifest to rule

Change-Id: I15288641ae86e9fb773344495ba35b66937145b6
Signed-off-by: Jinmook Lim <jinmook.lim@samsung.com>
---
 oma-dm-agent.manifest       | 14 --------------
 oma-dm-agent.rule           | 11 +++++++++++
 packaging/oma-dm-agent.spec |  3 +--
 src/agent/CMakeLists.txt    |  3 +++
 4 files changed, 15 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 oma-dm-agent.manifest
 create mode 100644 oma-dm-agent.rule
 mode change 100755 => 100644 packaging/oma-dm-agent.spec
 mode change 100755 => 100644 src/agent/CMakeLists.txt

diff --git a/oma-dm-agent.manifest b/oma-dm-agent.manifest
old mode 100755
new mode 100644
index 856da4a..3bbebbe
--- a/oma-dm-agent.manifest
+++ b/oma-dm-agent.manifest
@@ -8,20 +8,6 @@
 			<label name="oma-dm-agent::vconf_internal" />
 			<label name="oma-dm-agent::vconf_external" />
 		</provide>
-		<request>
-			<smack request="telephony_framework::api_modem" type="r" />
-			<smack request="telephony_framework::api_sim" type="r" />
-			<smack request="telephony_framework::api_ss" type="w" />
-			<smack request="contacts-service::svc" type="rw" />
-			<smack request="contacts-service::phonelog" type="rw" />
-			<smack request="system::vconf_system" type="r" />
-			<smack request="system::vconf_setting" type="rw" />
-			<smack request="system::vconf_inhouse" type="rw" />
-			<smack request="system::vconf_network" type="rw" />
-			<smack request="starter::vconf" type="rw" />
-			<smack request="data-provider-master::notification" type="rw" />
-			<smack request="data-provider-master::notification.client" type="rw" />
-		</request>
 	</define>
 	<assign>
 		<filesystem path="/usr/share/oma_dm_cfg/csc_setting/change_csc_value.sh" label="oma-dm-agent::cfg"/>
diff --git a/oma-dm-agent.rule b/oma-dm-agent.rule
new file mode 100644
index 0000000..b4b355a
--- /dev/null
+++ b/oma-dm-agent.rule
@@ -0,0 +1,11 @@
+oma-dm-agent telephony_framework::api_modem r
+oma-dm-agent telephony_framework::api_sim r
+oma-dm-agent telephony_framework::api_ss w
+oma-dm-agent contacts-service::svc rw
+oma-dm-agent contacts-service::phonelog rw
+oma-dm-agent system::vconf_system r
+oma-dm-agent system::vconf_setting rw
+oma-dm-agent system::vconf_inhouse rw
+oma-dm-agent system::vconf_network rw
+oma-dm-agent starter::vconf rw
+oma-dm-agent data-provider-master::notification rw
diff --git a/packaging/oma-dm-agent.spec b/packaging/oma-dm-agent.spec
old mode 100755
new mode 100644
index 59001bf..1dbde2f
--- a/packaging/oma-dm-agent.spec
+++ b/packaging/oma-dm-agent.spec
@@ -7,8 +7,6 @@ License:    Apache License, Version 2.0
 Source0:    oma-dm-agent-%{version}.tar.gz
 Source1:    oma-dm-agent.service
 
-Requires(post): contacts-service2
-Requires(post): telephony-daemon
 #Requires(post): /sbin/ldconfig
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(sqlite3)
@@ -154,6 +152,7 @@ rm -rf /usr/share/oma-dm-cfg
 %attr(600,root,root) /opt/usr/dbspace/.omadmagent.db-journal
 %attr(600,root,root) /opt/usr/dbspace/.momanager.db
 %attr(600,root,root) /opt/usr/dbspace/.momanager.db-journal
+/etc/smack/accesses2.d/oma-dm-agent.rule
 
 %manifest oma-dm-agent.manifest
 %defattr(-,root,root,-)
diff --git a/src/agent/CMakeLists.txt b/src/agent/CMakeLists.txt
old mode 100755
new mode 100644
index 0e9ea0f..ee6f488
--- a/src/agent/CMakeLists.txt
+++ b/src/agent/CMakeLists.txt
@@ -82,3 +82,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.omadmagent.service DESTINATION /us
 
 # install booting script file
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/${PROJECT_NAME} DESTINATION /etc/init.d/)
+
+# install smack rule file
+Install(FILES ${CMAKE_SOURCE_DIR}/oma-dm-agent.rule DESTINATION /etc/smack/accesses2.d)
-- 
2.7.4