Use dbus activation by Systemd(SystemdService=) in org.tizen.system.popup.service

Change-Id: I1f08db7e7b31ace82b85fc0fc6ea3e7b69a3f7ec
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0d2ee3..2362853 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ SET(SYSTEM_RESDIR "${PREFIX}/share/system-apps/res")
 SET(SYSTEM_ICONDIR "${SYSTEM_RESDIR}/icons")
 SET(LICENSE_DIR "${TZ_SYS_RO_SHARE}/license")
 SET(DBUS_SERVICE_DIR "${TZ_SYS_RO_SHARE}/dbus-1/system-services")
+SET(SYSTEMD_UNIT_DIR "/usr/lib/systemd/system")
 SET(LOCALE_DIR "${TZ_SYS_RO_SHARE}/locale")
 SET(LANG_DOMAIN "${PKGNAME}")
 

diff --git a/LICENSE b/LICENSE.Apache-2.0
similarity index 100%
rename from LICENSE
rename to LICENSE.Apache-2.0

diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec
index 0a49188..04ad984 100755 (executable)
--- a/packaging/system-servant.spec
+++ b/packaging/system-servant.spec
@@ -455,7 +455,8 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 
 %files
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
+%{_unitdir}/system-popup.service
 %{_datadir}/dbus-1/system-services/org.tizen.system.popup.service
 %config %{_sysconfdir}/dbus-1/system.d/launcher.conf
 
@@ -523,7 +524,7 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 %lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/system-servant.mo
 
 %files profile_mobile
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{_bindir}/sysapp-launcher.mobile
 %{_bindir}/system-cooperator
@@ -538,33 +539,33 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 # Because of CAPI incompatibility from EFL-EXT, wearable is buildable only for wearable and "unified (undefined)"
 %if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common"
 %files extension-circle-profile_wearable
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{_bindir}/sysapp-launcher.wearable
 %{_bindir}/system-cooperator
 
 %files extension-rectangle-profile_wearable
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{_bindir}/sysapp-launcher.wearable
 %{_bindir}/system-cooperator
 %endif
 
 %files profile_common
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{_bindir}/sysapp-launcher.common
 
 %files -n org.tizen.crash-syspopup
 %manifest org.tizen.crash-syspopup.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.crash-syspopup/bin/crash-popup
 %{TZ_SYS_RO_SHARE}/packages/org.tizen.crash-syspopup.xml
 
 %files -n org.tizen.system-syspopup.mobile
 %manifest org.tizen.system-syspopup.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.system-syspopup/bin/system-syspopup.mobile
 %{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/usb-popup.edj
@@ -574,7 +575,7 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 %if "%{?profile}"!="mobile" && "%{?profile}"!="tv" && "%{?profile}"!="ivi" && "%{?profile}"!="common"
 %files -n org.tizen.system-syspopup.wearable
 %manifest org.tizen.system-syspopup.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.system-syspopup/bin/system-syspopup.wearable
 %{TZ_SYS_RO_APP}/org.tizen.system-syspopup/shared/res/cooldown-popup.edj
@@ -583,7 +584,7 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 
 %files -n org.tizen.powerkey-syspopup.wearable
 %manifest org.tizen.powerkey-syspopup.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/bin/powerkey-popup.wearable
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/circle_btn_check.png
@@ -595,7 +596,7 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 
 %files -n org.tizen.powerkey-syspopup.mobile
 %manifest org.tizen.powerkey-syspopup.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/bin/powerkey-popup.mobile
 %{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/res/core_power_off.png
@@ -604,7 +605,7 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 
 %files -n org.tizen.overheat-syspopup
 %manifest org.tizen.overheat-syspopup.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.overheat-syspopup/bin/overheat-popup
 %{TZ_SYS_RO_APP}/org.tizen.overheat-syspopup/shared/res/overheat-popup.edj
@@ -612,7 +613,7 @@ mv /%{_bindir}/sysapp-launcher.common /%{_bindir}/sysapp-launcher
 
 %files -n org.tizen.system-signal-sender
 %manifest org.tizen.system-signal-sender.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_APP}/org.tizen.system-signal-sender/bin/system-signal-sender
 %{TZ_SYS_RO_SHARE}/packages/org.tizen.system-signal-sender.xml

diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt
index 1299e01..5f1f4ab 100755 (executable)
--- a/src/launcher/CMakeLists.txt
+++ b/src/launcher/CMakeLists.txt
@@ -47,6 +47,7 @@ TARGET_LINK_LIBRARIES(${APPNAME} ${launcher_pkgs_LDFLAGS} "-ldl")
 
 INSTALL(TARGETS ${APPNAME} DESTINATION bin)
 INSTALL(FILES ${LAUNCHER_DIR}/org.tizen.system.popup.service DESTINATION ${DBUS_SERVICE_DIR})
+INSTALL(FILES ${LAUNCHER_DIR}/system-popup.service DESTINATION ${SYSTEMD_UNIT_DIR})
 INSTALL(FILES ${LAUNCHER_DIR}/launcher.conf DESTINATION /etc/dbus-1/system.d)
 
 IF(NOTIFICATION_SERVICE STREQUAL on)

diff --git a/src/launcher/org.tizen.system.popup.service b/src/launcher/org.tizen.system.popup.service
index abc62ca..69af339 100644 (file)
--- a/src/launcher/org.tizen.system.popup.service
+++ b/src/launcher/org.tizen.system.popup.service
@@ -1,5 +1,4 @@
 [D-BUS Service]
 Name=org.tizen.system.popup
-Exec=/usr/bin/sysapp-launcher
-User=system_fw
-Group=system_fw
+Exec=/bin/false
+SystemdService=system-popup.service

diff --git a/src/launcher/system-popup.service b/src/launcher/system-popup.service
new file mode 100644 (file)
index 0000000..504d763
--- /dev/null
+++ b/src/launcher/system-popup.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=System popup
+
+[Service]
+Type=dbus
+BusName=org.tizen.system.popup
+User=system_fw
+Group=system_fw
+SmackProcessLabel=System
+ExecStart=/usr/bin/sysapp-launcher