Merge rule into manifest file.

Remove rule file

Change-Id: Ic7731c51d2c3b06900f42d213f7eab210644d263

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f8a4d2..acbc563 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkg_LDFLAGS} "-ldl")
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.data-provider-slave.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "org.tizen.${PROJECT_NAME}")
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/org.tizen.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-#INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.data-provider-slave.rule DESTINATION /etc/smack/accesses2.d)
 
 # INCLUDE FOR BUILD & INSTALL .PO FILES
 ADD_SUBDIRECTORY(res)

diff --git a/org.tizen.data-provider-slave.manifest b/org.tizen.data-provider-slave.manifest
index b61942c..bf8bcd0 100644 (file)
--- a/org.tizen.data-provider-slave.manifest
+++ b/org.tizen.data-provider-slave.manifest
@@ -5,7 +5,33 @@
        </define>
        <request>
                <domain name="org.tizen.data-provider-slave" />
+               <smack request="sys-assert::core" type="rwxat" />
+               <smack request="device::app_logging" type="w" />
+               <smack request="system::vconf" type="rwxat" />
+               <smack request="system::homedir" type="rwxat" />
+               <smack request="system::use_internet" type="rw" />
+               <smack request="system::media" type="rwxat" />
+               <smack request="system::share" type="rwxat" />
+               <smack request="sys-assert::core" type="rwxat" />
+               <smack request="ail::db" type="rw" />
+               <smack request="app-svc::db" type="rw" />
+               <smack request="xorg" type="rw" />
+               <smack request="isf" type="rwx" />
+               <smack request="dbus" type="wx" />
+               <smack request="data-provider-master::data" type="rx" />
+               <smack request="data-provider-master::share" type="rwxat" />
+               <smack request="data-provider-master::db" type="rw" />
+               <smack request="data-provider-master" type="rw" />
+               <smack request="e17" type="rx" />
+               <smack request="dali" type="x" />
+               <smack request="pulseaudio" type="rwxat" />
+               <smack request="pkgmgr::db" type="rw" />
        </request>
+       <permit>
+               <smack permit="e17" type="w" />
+               <smack permit="org.tizen.app-tray" type="rx" />
+               <smack permit="dbus" type="rwx" />
+       </permit>
 
        <assign>
                <!-- Application folder -->

diff --git a/org.tizen.data-provider-slave.rule b/org.tizen.data-provider-slave.rule
deleted file mode 100644 (file)
index 399263a..0000000
--- a/org.tizen.data-provider-slave.rule
+++ /dev/null
@@ -1,23 +0,0 @@
-org.tizen.data-provider-slave device::app_logging w
-org.tizen.data-provider-slave system::vconf rwxat
-org.tizen.data-provider-slave system::homedir rwxat
-org.tizen.data-provider-slave system::use_internet rw
-org.tizen.data-provider-slave system::media rwxat
-org.tizen.data-provider-slave system::share rwxat
-org.tizen.data-provider-slave sys-assert::core rwxat
-org.tizen.data-provider-slave ail::db rw
-org.tizen.data-provider-slave app-svc::db rw
-org.tizen.data-provider-slave xorg rw
-org.tizen.data-provider-slave isf rwx
-org.tizen.data-provider-slave dbus wx
-org.tizen.data-provider-slave data-provider-master::data rx
-org.tizen.data-provider-slave data-provider-master::share rwxat
-org.tizen.data-provider-slave data-provider-master::db rw
-org.tizen.data-provider-slave data-provider-master rw
-org.tizen.data-provider-slave e17 rx
-org.tizen.data-provider-slave dali x
-org.tizen.data-provider-slave pulseaudio rwxat
-org.tizen.data-provider-slave pkgmgr::db rw
-e17 org.tizen.data-provider-slave w
-org.tizen.app-tray org.tizen.data-provider-slave rx
-dbus org.tizen.data-provider-slave rwx

diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 6b85ad1..513da8f 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -30,6 +30,7 @@ BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(livebox)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(capi-system-system-settings)
+Requires: data-provider-master
 
 %description
 Plugin type liveboxes are managed by this.
@@ -60,7 +61,6 @@ chmod 755 %{app_data}
 %{_prefix}/apps/org.tizen.data-provider-slave/bin/data-provider-slave
 %{_datarootdir}/packages/org.tizen.data-provider-slave.xml
 %{_datarootdir}/license/*
-#%{_sysconfdir}/smack/accesses2.d/org.tizen.data-provider-slave.rule
 %dir %{app_data}
 
 # End of a file