--- rpms/e-smith-email/sme10/e-smith-email.spec	2020/06/28 03:52:15	1.7
+++ rpms/e-smith-email/sme10/e-smith-email.spec	2020/12/11 14:42:46	1.8
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.6 2016/06/15 08:30:29 unnilennium Exp $
+# $Id: e-smith-email.spec,v 1.7 2020/06/28 03:52:15 jpp Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.6.0
-%define release 7
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,7 @@ Patch1: e-smith-email-5.6.0-qpsmtpd_in_a
 Patch2: e-smith-email-5.6.0-qpsmtpd_in_masq_templates.patch
 Patch3: e-smith-email-5.6.0-mysqld2mariadb.patch
 Patch4: e-smith-email-5.6.0-bz3802-create-local-pseudo.patch
+Patch5: e-smith-email-5.6.0-bz11133-bz11102-systemd-update.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
@@ -44,6 +45,8 @@ AutoReqProv: no
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+rm -rf root/var/service/
 
 %build
 perl createlinks
@@ -56,13 +59,6 @@ rm -rf $RPM_BUILD_ROOT
 rm -f %{name}-%{version}-%{release}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT       \
     --dir /var/lock/fetchmail 'attr(755,qmailr,qmail)' \
-    --dir '/var/service/smtp-auth-proxy' 'attr(1755,root,root)' \
-    --file '/var/service/smtp-auth-proxy/down' 'attr(0644,root,root)' \
-    --file '/var/service/smtp-auth-proxy/run' 'attr(0755,root,root)' \
-    --dir '/var/service/smtp-auth-proxy/supervise' 'attr(0700,root,root)' \
-    --dir '/var/service/smtp-auth-proxy/log' 'attr(0755,root,root)' \
-    --file '/var/service/smtp-auth-proxy/log/run' 'attr(0755,root,root)' \
-    --file '/var/service/smtp-auth-proxy/log/supervise' 'attr(0700,root,root)' \
     --dir '/var/log/smtp-auth-proxy' 'attr(2750,smelog,nofiles)' \
     --file '/usr/local/sbin/smtp-auth-proxy.pl' 'attr(0755,root,root)' \
     --dir '/home/e-smith/Maildir/.junkmail' 'attr(0700,admin,admin)' \
@@ -78,11 +74,22 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
 
+%pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/smtp-auth-proxy/run ] ; then
+       /usr/bin/sv d smtp-auth-proxy
+       /usr/bin/sv d smtp-auth-proxy/log
+  fi
+fi
 
 %description
 e-smith server and gateway software - email module.
 
 %changelog
+* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-8.sme
+- create -update event [SME: 11133]
+- move smtp-auth-proxy to systemd [SME: 11102]
+
 * Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-7.sme
 - allow creation of pseudonyms with setting of local only [SME: 3802]