diff options
author | Yunmi Ha <yunmi.ha@samsung.com> | 2019-08-20 07:47:51 +0000 |
---|---|---|
committer | Yunmi Ha <yunmi.ha@samsung.com> | 2019-08-20 16:52:01 +0900 |
commit | 6abc5b18d520bb0cbb69714f7b9ec37157dfd8c3 (patch) | |
tree | 5780460d357bcfcf43b31523f7a4c971d690022f | |
parent | 1bbbe003350f5e2958eeab74d118a2631ab32e0c (diff) | |
download | isf-config-6abc5b18d520bb0cbb69714f7b9ec37157dfd8c3.tar.gz isf-config-6abc5b18d520bb0cbb69714f7b9ec37157dfd8c3.tar.bz2 isf-config-6abc5b18d520bb0cbb69714f7b9ec37157dfd8c3.zip |
Revert "tizen: Add additional unit for "unified" user session"
This reverts commit ac9ed8c65311123504d84f5f88affbec94a0718d.
We've optimized systemd-user without unified system/session.
So, we revert the patch for unified system/session.
Change-Id: I9e55191a7d811076cd91d664b7eab4289bfb607b
-rw-r--r-- | packaging/isf-config-mobile.spec | 6 | ||||
-rw-r--r-- | scim@.service | 20 |
2 files changed, 0 insertions, 26 deletions
diff --git a/packaging/isf-config-mobile.spec b/packaging/isf-config-mobile.spec index b2757b8..86ea7a4 100644 --- a/packaging/isf-config-mobile.spec +++ b/packaging/isf-config-mobile.spec @@ -21,14 +21,10 @@ rm -rf %{buildroot} %__mkdir_p %{buildroot}%{_sysconfdir}/scim/conf %__mkdir_p %{buildroot}%{_prefix}/lib/systemd/user %__mkdir_p %{buildroot}%{_prefix}/lib/systemd/user/basic.target.wants -%__mkdir_p %{buildroot}%{_prefix}/lib/systemd/system -%__mkdir_p %{buildroot}%{_prefix}/lib/systemd/system/user-basic@.target.wants %__cp etc/scim/conf/* %{buildroot}%{_sysconfdir}/scim/conf %__cp scim.service %{buildroot}%{_prefix}/lib/systemd/user ln -sf ../scim.service %{buildroot}%{_prefix}/lib/systemd/user/basic.target.wants/scim.service -%__cp scim@.service %{buildroot}%{_prefix}/lib/systemd/system -ln -sf ../scim@.service %{buildroot}%{_prefix}/lib/systemd/system/user-basic@.target.wants/scim@.service %files %manifest %{name}.manifest @@ -36,6 +32,4 @@ ln -sf ../scim@.service %{buildroot}%{_prefix}/lib/systemd/system/user-basic@.ta /etc/scim/conf/* %{_prefix}/lib/systemd/user/scim.service %{_prefix}/lib/systemd/user/basic.target.wants/scim.service -%{_prefix}/lib/systemd/system/scim@.service -%{_prefix}/lib/systemd/system/user-basic@.target.wants/scim@.service %license LICENSE.APLv2 diff --git a/scim@.service b/scim@.service deleted file mode 100644 index 207794d..0000000 --- a/scim@.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -PartOf=userlogin@%i.target -Description=Start the input service framework panel -After=enlightenment-user@%i.service -DefaultDependencies=no -ConditionPathExists=!/run/user/%i/.container - -[Service] -User=%i -Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus -Environment=XDG_RUNTIME_DIR=/run/user/%i -SmackProcessLabel=User -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=on-failure -RestartSec=2 - -[Install] -WantedBy=user-default@.target |