Enable tlm by config package instead of main package

Change-Id: Ie941fc1ab289f96121ac40940a69ee7c70563a38
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index b2e9a7c..a1aaa6e 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.spec
+++ b/dists/rpm/tizen/packaging/tlm.spec
@@ -25,7 +25,6 @@ Requires(post): /sbin/ldconfig, systemd
 Requires(postun): /sbin/ldconfig, systemd
 Requires: gumd
 Requires: libsystemd
-Requires: tlm-config
 BuildRequires: pkgconfig(glib-2.0) >= 2.30
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gio-2.0)
@@ -153,16 +152,8 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 
 %post
 /sbin/ldconfig
-/usr/bin/systemctl enable tlm
-/usr/bin/systemctl daemon-reload
 
 
-%preun
-if [ $1 == 0 ]; then
-       /usr/bin/systemctl disable tlm
-       /usr/bin/systemctl daemon-reload
-fi
-
 %postun -p /sbin/ldconfig
 
 
@@ -172,6 +163,14 @@ fi
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
 ln -s -f /etc/tlm-singleseat.conf /etc/tlm.conf
 fi
+/usr/bin/systemctl enable tlm
+/usr/bin/systemctl daemon-reload
+
+%preun config-ivi-singleseat
+if [ $1 == 0 ]; then
+       /usr/bin/systemctl disable tlm
+       /usr/bin/systemctl daemon-reload
+fi
 
 %postun config-ivi-singleseat
 if [ -h /etc/tlm.conf ]; then
@@ -183,6 +182,14 @@ fi
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
 ln -s -f /etc/tlm-multiseat.conf /etc/tlm.conf
 fi
+/usr/bin/systemctl enable tlm
+/usr/bin/systemctl daemon-reload
+
+%preun config-ivi-multiseat
+if [ $1 == 0 ]; then
+       /usr/bin/systemctl disable tlm
+       /usr/bin/systemctl daemon-reload
+fi
 
 %postun config-ivi-multiseat
 if [ -h /etc/tlm.conf ]; then
@@ -194,6 +201,14 @@ fi
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
 ln -s -f /etc/tlm-vtc1010.conf /etc/tlm.conf
 fi
+/usr/bin/systemctl enable tlm
+/usr/bin/systemctl daemon-reload
+
+%preun config-ivi-vtc1010
+if [ $1 == 0 ]; then
+       /usr/bin/systemctl disable tlm
+       /usr/bin/systemctl daemon-reload
+fi
 
 %postun config-ivi-vtc1010
 if [ -h /etc/tlm.conf ]; then

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index b2e9a7c..a1aaa6e 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -25,7 +25,6 @@ Requires(post): /sbin/ldconfig, systemd
 Requires(postun): /sbin/ldconfig, systemd
 Requires: gumd
 Requires: libsystemd
-Requires: tlm-config
 BuildRequires: pkgconfig(glib-2.0) >= 2.30
 BuildRequires: pkgconfig(gobject-2.0)
 BuildRequires: pkgconfig(gio-2.0)
@@ -153,16 +152,8 @@ install -m 755 data/tizen-common/etc/session.d/* %{buildroot}%{_sysconfdir}/sess
 
 %post
 /sbin/ldconfig
-/usr/bin/systemctl enable tlm
-/usr/bin/systemctl daemon-reload
 
 
-%preun
-if [ $1 == 0 ]; then
-       /usr/bin/systemctl disable tlm
-       /usr/bin/systemctl daemon-reload
-fi
-
 %postun -p /sbin/ldconfig
 
 
@@ -172,6 +163,14 @@ fi
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
 ln -s -f /etc/tlm-singleseat.conf /etc/tlm.conf
 fi
+/usr/bin/systemctl enable tlm
+/usr/bin/systemctl daemon-reload
+
+%preun config-ivi-singleseat
+if [ $1 == 0 ]; then
+       /usr/bin/systemctl disable tlm
+       /usr/bin/systemctl daemon-reload
+fi
 
 %postun config-ivi-singleseat
 if [ -h /etc/tlm.conf ]; then
@@ -183,6 +182,14 @@ fi
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
 ln -s -f /etc/tlm-multiseat.conf /etc/tlm.conf
 fi
+/usr/bin/systemctl enable tlm
+/usr/bin/systemctl daemon-reload
+
+%preun config-ivi-multiseat
+if [ $1 == 0 ]; then
+       /usr/bin/systemctl disable tlm
+       /usr/bin/systemctl daemon-reload
+fi
 
 %postun config-ivi-multiseat
 if [ -h /etc/tlm.conf ]; then
@@ -194,6 +201,14 @@ fi
 if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
 ln -s -f /etc/tlm-vtc1010.conf /etc/tlm.conf
 fi
+/usr/bin/systemctl enable tlm
+/usr/bin/systemctl daemon-reload
+
+%preun config-ivi-vtc1010
+if [ $1 == 0 ]; then
+       /usr/bin/systemctl disable tlm
+       /usr/bin/systemctl daemon-reload
+fi
 
 %postun config-ivi-vtc1010
 if [ -h /etc/tlm.conf ]; then