Modify smack rule for Tizen 3.0

Change-Id: I9a9702866e5a6f536fe3e47043dc05dec326bf61

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e19cca1..769e485 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,6 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 INSTALL(DIRECTORY DESTINATION ${DATADIR})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKGNAME}.efl DESTINATION /etc/smack/accesses.d)
+#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKGNAME}.efl DESTINATION /etc/smack/accesses.d)
 
 ADD_SUBDIRECTORY(data)

diff --git a/org.tizen.indicator.efl b/org.tizen.indicator.efl
deleted file mode 100644 (file)
index a536e20..0000000
--- a/org.tizen.indicator.efl
+++ /dev/null
@@ -1,74 +0,0 @@
-org.tizen.indicator org.tizen.fm-radio-lite rwx--- ------
-org.tizen.indicator org.tizen.call-ui::vconf rwx--- ------
-org.tizen.indicator deviced::haptic rwx--- ------
-org.tizen.indicator bt-service rw---- ------
-org.tizen.indicator system::use_internet r----l ------
-org.tizen.indicator org.tizen.pwlock rwx--l ------
-org.tizen.indicator org.tizen.oma-dm r-x--l ------
-org.tizen.indicator ail::db rw---l ------
-org.tizen.indicator notification::db rw---l ------
-org.tizen.indicator dbus rwx--l ------
-org.tizen.indicator immvibed rw---l ------
-org.tizen.indicator svi-data r-x--l ------
-org.tizen.indicator sound_server -w---- ------
-org.tizen.indicator email-service --x--- ------
-org.tizen.indicator xorg rwx--- ------
-org.tizen.indicator org.tizen.quickpanel r-x--- ------
-org.tizen.indicator isf r-x--- ------
-org.tizen.indicator stest-service -w---- ------
-org.tizen.indicator libslp-alarm::db rw---- ------
-org.tizen.indicator data-provider-master::notification rw---l ------
-org.tizen.indicator data-provider-master::notification.client -w---- ------
-org.tizen.indicator data-provider-master rw---l ------
-org.tizen.indicator device::sys_logging -w---- ------
-stest-service org.tizen.indicator r-x--l ------
-dbus org.tizen.indicator rwx--- ------
-org.tizen.indicator eas-engine::vconf r----l ------
-org.tizen.indicator system::vconf_inhouse rw---l ------
-org.tizen.indicator system::vconf_setting rw---l ------
-org.tizen.indicator system::vconf_network rw---l ------
-org.tizen.indicator system::vconf_multimedia rw---l ------
-org.tizen.indicator system::vconf_system rw---l ------
-org.tizen.indicator org.tizen.facebook::vconf_sync rw---l ------
-org.tizen.indicator system::vconf_deviced r----l ------
-org.tizen.indicator location_fw::vconf r----l ------
-org.tizen.indicator felicalock r----l ------
-org.tizen.indicator starter::vconf r----l ------
-org.tizen.indicator org.tizen.music-player r----l ------
-org.tizen.indicator org.tizen.voicerecorder r----l ------
-org.tizen.indicator csc-feature r----l ------
-org.tizen.indicator tts-server rwx--l ------
-org.tizen.indicator org.tizen.download-manager::vconf_public r----l ------
-org.tizen.indicator download-provider::vconf_public r----l ------
-org.tizen.indicator pkgmgr::db rw---l ------
-org.tizen.indicator google-pim-sync::vconf_sync_status r----l ------
-org.tizen.indicator cloud-pdm::vconf_sync r----l ------
-org.tizen.indicator org.tizen.setting::private r----l ------
-org.tizen.indicator aul::launch --x--- ------
-org.tizen.indicator bt-service::public -wx--- ------
-org.tizen.indicator org.tizen.music-live-share r----l ------
-org.tizen.indicator app-svc::db rw---l ------
-org.tizen.indicator org.tizen.videos r----l ------
-org.tizen.indicator email::vconf_sync_status rw---l ------
-org.tizen.indicator telephony_framework::vconf rw---l ------
-org.tizen.indicator telephony_framework::api_sim rwx--- ------
-org.tizen.indicator telephony_framework::properties rw---- ------
-org.tizen.indicator telephony_framework::api_network rw---l ------
-org.tizen.indicator ug-setting-call-efl::vconf rw---l ------
-org.tizen.indicator location_fw::client r----l ------
-org.tizen.indicator contacts-service::svc --x--- ------
-org.tizen.indicator system::homedir rwxat- ------
-org.tizen.indicator system::vconf rwxat- ------
-org.tizen.indicator system::media rwxat- ------
-org.tizen.indicator system::share rwxat- ------
-org.tizen.indicator pulseaudio rwxat- ------
-e17 org.tizen.indicator -w---- ------
-org.tizen.indicator device::app_logging -w---- ------
-org.tizen.indicator sys-assert::core rwxat- ------
-org.tizen.indicator privacy-manager::db r----l ------
-org.tizen.indicator system::vconf_privacy rw---- ------
-org.tizen.indicator system::vconf_misc rw---- ------
-org.tizen.indicator ecore::lock rwxat- ------
-org.tizen.indicator tizen::vconf::platform::rw r----- ------
-org.tizen.indicator connman::get rw---- ------ 
-org.tizen.indicator telephony_framework::api_ps_public rw---- ------ 

diff --git a/org.tizen.indicator.manifest b/org.tizen.indicator.manifest
index 5fa680d..c00c25b 100644 (file)
--- a/org.tizen.indicator.manifest
+++ b/org.tizen.indicator.manifest
@@ -1,13 +1,5 @@
 <manifest>
-       <define>
-               <domain name="org.tizen.indicator"/>
-       </define>
-       <assign>
-               <filesystem path="/etc/init.d/indicator" label="_" exec_label="none"/>
-               <filesystem path="/etc/rc.d/rc5.d/S01indicator" label="_" exec_label="none"/>
-               <filesystem path="/etc/rc.d/rc3.d/S44indicator" label="_" exec_label="none"/>
-       </assign>
-       <request>
-               <domain name="org.tizen.indicator"/>
-       </request>
+        <request>
+                <domain name="_" />
+        </request>
 </manifest>

diff --git a/packaging/org.tizen.indicator.spec b/packaging/org.tizen.indicator.spec
index 14db936..1aa3187 100644 (file)
--- a/packaging/org.tizen.indicator.spec
+++ b/packaging/org.tizen.indicator.spec
@@ -106,11 +106,16 @@ cp -f LICENSE %{buildroot}/usr/share/license/%{PKGNAME}
 #install -d %{buildroot}/usr/lib/systemd/user/core-efl.target.wants
 #install -m0644 %{SOURCE101} %{buildroot}/usr/lib/systemd/user/
 #ln -sf ../indicator.service %{buildroot}/usr/lib/systemd/user/core-efl.target.wants/indicator.service
-mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
-install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/system/indicator.service
-ln -s ../indicator.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/indicator.service
-install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/system/indicator.path
-ln -s ../indicator.path %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/
+#mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+#install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/system/indicator.service
+#ln -s ../indicator.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/indicator.service
+#install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/system/indicator.path
+#ln -s ../indicator.path %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/
+mkdir -p %{buildroot}/usr/lib/systemd/user/default.target.wants
+install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/user/indicator.service
+ln -s ../indicator.service %{buildroot}/usr/lib/systemd/user/default.target.wants/indicator.service
+install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/user/indicator.path
+ln -s ../indicator.path %{buildroot}/usr/lib/systemd/user/default.target.wants/
 
 %clean
 rm -rf %{buildroot}
@@ -131,12 +136,16 @@ vconftool set -t int memory/private/%{PKGNAME}/show_more_noti_port 0 -i -g 6518
 %attr(755,-,-) %{_sysconfdir}/init.d/indicator
 #/usr/lib/systemd/user/core-efl.target.wants/indicator.service
 #/usr/lib/systemd/user/indicator.service
-/usr/lib/systemd/system/multi-user.target.wants/indicator.service
-/usr/lib/systemd/system/indicator.service
-/usr/lib/systemd/system/multi-user.target.wants/indicator.path
-/usr/lib/systemd/system/indicator.path
+#/usr/lib/systemd/system/multi-user.target.wants/indicator.service
+#/usr/lib/systemd/system/indicator.service
+#/usr/lib/systemd/system/multi-user.target.wants/indicator.path
+#/usr/lib/systemd/system/indicator.path
+/usr/lib/systemd/user/default.target.wants/indicator.service
+/usr/lib/systemd/user/indicator.service
+/usr/lib/systemd/user/default.target.wants/indicator.path
+/usr/lib/systemd/user/indicator.path
 /usr/share/license/%{PKGNAME}
-/etc/smack/accesses.d/%{PKGNAME}.efl
+#/etc/smack/accesses.d/%{PKGNAME}.efl
 /usr/apps/%{PKGNAME}/author-signature.xml
 /usr/apps/%{PKGNAME}/signature1.xml
 /usr/apps/%{PKGNAME}/shared/res/tables/org.tizen.indicator_ChangeableColorInfo.xml