--- rpms/smeserver-yum/sme10/smeserver-yum.spec	2020/12/07 19:41:43	1.57
+++ rpms/smeserver-yum/sme10/smeserver-yum.spec	2020/12/09 04:35:17	1.58
@@ -1,10 +1,10 @@
-# $Id: smeserver-yum.spec,v 1.56 2020/12/07 19:12:11 jpp Exp $
+# $Id: smeserver-yum.spec,v 1.57 2020/12/07 19:41:43 jpp Exp $
 
 %define name smeserver-yum
 Summary: YUM, an rpm updater
 Name: %{name}
 %define version 2.6.0
-%define release 41
+%define release 42
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -44,6 +44,7 @@ Patch30: smeserver-yum-2.6.0-bz11175-pre
 Patch31: smeserver-yum-2.6.0-bz11168-bz11179-remi-safe_and-event.patch
 Patch32: smeserver-yum-2.6.0.bz11227-eolvault.patch
 Patch33: smeserver-yum-2.6.0-bz11184-smeserver.py.patch
+Patch34: smeserver-yum-2.6.0-bz11180-yum-dbupdate-systemd.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -107,6 +108,8 @@ AutoReqProv: no
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
+rm -rf root/var/service/ root/service/
 
 %build
 perl createlinks
@@ -124,12 +127,6 @@ mkdir -p root/etc/yum.smerepos.d
     --file '/sbin/e-smith/check4contribsupdates' 'attr(0755,root,root)' \
     --file '/sbin/e-smith/yumdownloadonly' 'attr(0755,root,root)' \
     --file '/etc/cron.daily/smeserver-yum' 'attr(0700,root,root)' \
-    --file /var/service/yum/down 'attr(0644,root,root)' \
-    --file /var/service/yum/run 'attr(0755,root,root)' \
-    --dir /var/service/yum/log 'attr(0755,root,root)' \
-    --dir /var/service/yum/log/supervise 'attr(0700,root,root)' \
-    --dir /var/service/yum/supervise 'attr(0700,root,root)' \
-    --file /var/service/yum/log/run 'attr(0755,root,root)' \
     --dir /var/log/yum 'attr(2750,smelog,smelog)' \
     $RPM_BUILD_ROOT > %{name}-%{version}-%{release}-filelist
 
@@ -140,8 +137,21 @@ mkdir -p root/etc/yum.smerepos.d
 
 %defattr(-,root,root)
 
+%pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/yum/run ] ; then
+       /usr/bin/sv d yum
+       /usr/bin/sv d yum/log        
+  fi
+  if [ -e /var/service/yum ] ; then
+       rm -rf /var/service/yum >/dev/null 2>&1
+  fi
+fi
 
 %changelog
+* Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-42.sme
+- move yum upate db service to systemd [SME: 11180]
+
 * Sun Dec 06 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-41.sme
 - fix -update events not runt on package upgrade [SME: 11184]
   lower noise on forced restart