Modified scim.service file to fix build error in 64 bits

Change-Id: I1d4d4823d3e9da9b69de8f9fb7e1e92f71589d25

diff --git a/Makefile.am b/Makefile.am
index d543515..9bc30c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,8 +57,7 @@ pkgconfig_DATA          = isf.pc scim.pc \
                          $(GTK_UTILS_PKGCONFIG)
 
 
-# $(libdir) will be /usr/lib64 on x86_64 arch, so hard-coded.
-systemduserunitdir = /usr/lib/systemd/system
+systemduserunitdir = $(libdir)/systemd/system
 systemduserunit_DATA = scim.service
 
 ACLOCAL_AMFLAGS = -I ism/m4

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 5de7442..61c6131 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -6,7 +6,6 @@ Release:    1
 Group:      Graphics & UI Framework/Input
 License:    LGPL-2.1
 Source0:    %{name}-%{version}.tar.gz
-Source1:    scim.service
 Source1001: isf.manifest
 BuildRequires:  edje-bin
 BuildRequires:  embryo-bin
@@ -124,14 +123,6 @@ mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/Helper
 mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/SetupUI
 mkdir -p %{buildroot}/opt/apps/scim/lib/scim-1.0/1.4.0/IMEngine
 
-%if %{with wayland}
-%else
-install -d %{buildroot}%{_libdir}/systemd/system/graphical.target.wants
-install -d %{buildroot}%{_libdir}/systemd/system
-install -m0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
-ln -sf ../../system/scim.service %{buildroot}%{_libdir}/systemd/system/graphical.target.wants/scim.service
-%endif
-
 %find_lang scim
 
 cat scim.lang > isf.lang

diff --git a/packaging/scim.service b/packaging/scim.service
deleted file mode 100644 (file)
index ad35b89..0000000
--- a/packaging/scim.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Start the input service framework panel
-After=enlightenment.service
-Requires=enlightenment.service
-
-[Service]
-ExecStart=/usr/bin/scim -d
-Environment="DISPLAY=:0.0" "HOME=%h"
-Nice=5
-OOMScoreAdjust=-100
-Restart=always
-RestartSec=2
-
-[Install]
-WantedBy=graphical.target

diff --git a/scim.service b/scim.service
index 06f9088..ad35b89 100644 (file)
--- a/scim.service
+++ b/scim.service
@@ -1,12 +1,15 @@
 [Unit]
 Description=Start the input service framework panel
-DefaultDependencies=no
-After=local-fs.target xorg.service e17.service wm_ready.service
+After=enlightenment.service
+Requires=enlightenment.service
 
 [Service]
 ExecStart=/usr/bin/scim -d
+Environment="DISPLAY=:0.0" "HOME=%h"
+Nice=5
+OOMScoreAdjust=-100
 Restart=always
 RestartSec=2
 
 [Install]
-WantedBy=core-efl.target
+WantedBy=graphical.target