--- rpms/e-smith-email/sme10/e-smith-email.spec	2016/06/15 08:30:29	1.6
+++ rpms/e-smith-email/sme10/e-smith-email.spec	2021/09/10 04:24:21	1.12
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.5 2016/06/07 06:57:30 vip-ire Exp $
+# $Id: e-smith-email.spec,v 1.11 2021/03/30 16:55:54 jpp Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.6.0
-%define release 6
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,12 @@ Patch0: e-smith-email-5.6.0-smtpd_to_qps
 Patch1: e-smith-email-5.6.0-qpsmtpd_in_auth_proxy.patch
 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
+Patch6: e-smith-email-5.6.0-bz11443-webmailOnlySSL.patch
+Patch7: e-smith-email-5.6.0-bz11265-rar.patch
+Patch8: e-smith-email-5.6.0-bz11634-lock.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -41,6 +47,12 @@ AutoReqProv: no
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+rm -rf root/var/service/ root/service
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 perl createlinks
@@ -53,13 +65,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)' \
@@ -75,11 +80,34 @@ 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 Sep 10 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-12.sme
+- make /var/lock/fetchmail dir permanent [SME: 11634]
+
+* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.6.0-11.sme
+- add new RAR file signatures to default mailpatterns database [SME: 11265]
+
+* Thu Mar 11 2021 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-10.sme
+- webmail is only SSL [SME: 11443]
+
+* Fri Dec 11 2020 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-9.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]
+
 * Wed Jun 15 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-6.sme
 - fix webmail status not displaying correctly in manager [SME: 9594]