From 19cdf745a2d56a0d5eb394d49e0a988600789491 Mon Sep 17 00:00:00 2001 From: Yunmi Ha Date: Thu, 23 Feb 2017 18:29:08 +0900 Subject: [PATCH] Fix incorrect requirement and service enable code 1. Replace requirement gumd to gum-utils. (tlm uses gum-utils binary when add default user) 2. Move tlm service enable code to tlm package. most of tizen system service is located %{_unitdir}. And for tracking rpm package information of tlm.service, move and add service link to tlm package. Change-Id: I3ef9a8e517a200d674661be491599cfd3b26213e --- packaging/tlm.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packaging/tlm.spec b/packaging/tlm.spec index 2d9673e..c3a3009 100755 --- a/packaging/tlm.spec +++ b/packaging/tlm.spec @@ -26,7 +26,7 @@ Requires(post): systemd Requires(postun): /sbin/ldconfig Requires(postun): systemd Requires(post): tizen-platform-config -Requires: gumd +Requires: gum-utils Requires: libsystemd Requires: pam-modules-extra BuildRequires: pkgconfig(glib-2.0) >= 2.30 @@ -110,6 +110,8 @@ rm -rf %{buildroot} rm -f %{buildroot}%{_sysconfdir}/tlm.conf install -m 755 -d %{buildroot}%{_unitdir} install -m 644 data/tlm.service %{buildroot}%{_unitdir} +mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants +ln -s ../tlm.service %{buildroot}%{_unitdir}/multi-user.target.wants/tlm.service install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d install -m 644 data/tlm-login %{buildroot}%{_sysconfdir}/pam.d/ install -m 644 data/tlm-default-login %{buildroot}%{_sysconfdir}/pam.d/ @@ -155,14 +157,14 @@ fi if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then ln -s -f /etc/tlm-singleseat.conf /etc/tlm.conf fi -systemctl enable tlm -systemctl daemon-reload +#systemctl enable tlm +#systemctl daemon-reload -%preun config-common-singleseat -if [ $1 == 0 ]; then - systemctl disable tlm - systemctl daemon-reload -fi +#%preun config-common-singleseat +#if [ $1 == 0 ]; then + #systemctl disable tlm + #systemctl daemon-reload +#fi %postun config-common-singleseat if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then @@ -181,6 +183,7 @@ fi %{_libdir}/lib%{name}*.so.* %{_libdir}/%{name}/plugins/*.so* %{_unitdir}/tlm.service +%{_unitdir}/multi-user.target.wants/tlm.service %config %{_sysconfdir}/pam.d/tlm-login %config %{_sysconfdir}/pam.d/tlm-default-login %config %{_sysconfdir}/pam.d/tlm-system-login -- 2.7.4