Fix incorrect requirement and service enable code 98/116198/1 accepted/tizen/common/20170223.182459 accepted/tizen/ivi/20170223.120935 accepted/tizen/mobile/20170223.120755 accepted/tizen/tv/20170223.120853 accepted/tizen/unified/20170309.033812 accepted/tizen/wearable/20170223.120919 submit/tizen/20170223.094936 submit/tizen_unified/20170308.100409
authorYunmi Ha <yunmi.ha@samsung.com>
Thu, 23 Feb 2017 09:29:08 +0000 (18:29 +0900)
committerYunmi Ha <yunmi.ha@samsung.com>
Thu, 23 Feb 2017 09:29:08 +0000 (18:29 +0900)
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

index 2d9673e..c3a3009 100755 (executable)
@@ -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