From c885510d00f83dc992b0ef90dc7406df23c0e9c7 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 26 Nov 2015 15:43:57 +0900 Subject: [PATCH] Apply systemd path activation Change-Id: Ie70accc79b1305b39a193e29791715921bd9cb04 --- Makefile.am | 4 ++-- packaging/isf.spec | 3 ++- scim.path | 6 ++++++ scim.service | 3 --- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 scim.path diff --git a/Makefile.am b/Makefile.am index 4b74b8e..67a028a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,7 @@ kbdmodechangerxml_DATA = org.tizen.isf-kbd-mode-changer.xml endif if ISF_INSTALL_SYSTEMD_SCRIPT -SYSTEMD_SCRIPT = scim.service +SYSTEMD_SCRIPT = scim.service scim.path endif # $(libdir) will be /usr/lib64 on x86_64 arch, so hard-coded. systemduserunitdir = /usr/lib/systemd/user @@ -81,5 +81,5 @@ uninstall-local: install-data-hook: if ISF_INSTALL_SYSTEMD_SCRIPT $(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/default.target.wants - ln -sf ../scim.service $(DESTDIR)$(systemduserunitdir)/default.target.wants/scim.service + ln -sf ../scim.path $(DESTDIR)$(systemduserunitdir)/default.target.wants/scim.path endif diff --git a/packaging/isf.spec b/packaging/isf.spec index 01fde45..374b06e 100644 --- a/packaging/isf.spec +++ b/packaging/isf.spec @@ -154,8 +154,9 @@ ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_im %dir /opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI %dir /opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine %dir /etc/scim/conf -%{_prefix}/lib/systemd/user/default.target.wants/scim.service +%{_prefix}/lib/systemd/user/default.target.wants/scim.path %{_prefix}/lib/systemd/user/scim.service +%{_prefix}/lib/systemd/user/scim.path %attr(755,root,root) %{_sysconfdir}/profile.d/isf.sh %{_sysconfdir}/scim/global %{_sysconfdir}/scim/config diff --git a/scim.path b/scim.path new file mode 100644 index 0000000..f2fbf95 --- /dev/null +++ b/scim.path @@ -0,0 +1,6 @@ +[Unit] +Description=This path will tell you that isf (scim) daemons are ready to launch + +[Path] +PathExists=/run/.wm_ready + diff --git a/scim.service b/scim.service index acced33..5f23f71 100644 --- a/scim.service +++ b/scim.service @@ -1,10 +1,7 @@ [Unit] Description=Start the input service framework panel -After=enlightenment.service -Requires=enlightenment.service [Service] -#ExecStart=/usr/bin/scim -d ExecStart=/usr/bin/isf-wsc-efl Environment="DISPLAY=:0.0" "HOME=%h" USE_OZONE_WAYLAND_VKB=1 OZONE_WAYLAND_USE_XDG_SHELL='defined' EnvironmentFile=/run/tizen-system-env -- 2.7.4