Move systemd configuration files into isf-config of each profile

Change-Id: I38704afb3b8b5805ffc10c39bc2c1412086128fc

diff --git a/Makefile.am b/Makefile.am
index be4a7fe..fab38c0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,13 +59,6 @@ pkgconfig_DATA          = isf.pc scim.pc \
 kbdmodechangerxmldir = @RO_PACKAGES_DIR@
 kbdmodechangerxml_DATA = org.tizen.isf-kbd-mode-changer.xml
 
-if ISF_INSTALL_SYSTEMD_SCRIPT
-SYSTEMD_SCRIPT = scim.service scim.path
-endif
-# $(libdir) will be /usr/lib64 on x86_64 arch, so hard-coded.
-systemduserunitdir = /usr/lib/systemd/user
-systemduserunit_DATA = $(SYSTEMD_SCRIPT)
-
 ACLOCAL_AMFLAGS = -I ism/m4
 
 .PHONY: update-ChangeLog
@@ -77,7 +70,3 @@ uninstall-local:
        rm -rf @SCIM_MODULE_PATH@
 
 install-data-hook:
-if ISF_INSTALL_SYSTEMD_SCRIPT
-       $(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/default.target.wants
-       ln -sf ../scim.path $(DESTDIR)$(systemduserunitdir)/default.target.wants/scim.path
-endif

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 0a7f5de..d6e9a92 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -124,10 +124,6 @@ mkdir -p %{buildroot}/etc/scim/conf
 
 cat scim.lang > isf.lang
 %post
-%if "%{?profile}" == "mobile"
-mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
-ln -sf %{_prefix}/lib/systemd/user/scim.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
-%endif
 ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_imf/modules/wayland/v-1.16/libwltextinputmodule.so
 /sbin/ldconfig
 
@@ -139,9 +135,6 @@ ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_im
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %dir /etc/scim/conf
-%{_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
deleted file mode 100644 (file)
index f2fbf95..0000000
--- a/scim.path
+++ /dev/null
@@ -1,6 +0,0 @@
-[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
deleted file mode 100644 (file)
index 5e6fcbd..0000000
--- a/scim.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Start the input service framework panel
-
-[Service]
-ExecStart=/usr/bin/isf-panel-efl
-Environment="DISPLAY=:0.0" "HOME=%h" USE_OZONE_WAYLAND_VKB=1 OZONE_WAYLAND_USE_XDG_SHELL='defined'
-EnvironmentFile=/run/tizen-system-env
-Restart=always
-RestartSec=2
-
-[Install]
-WantedBy=default.target