--- rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2020/12/16 16:21:20	1.10
+++ rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/02/19 06:03:30	1.16
@@ -1,16 +1,18 @@
-# $Id: smeserver-spamassassin.spec,v 1.9 2017/06/28 18:41:51 unnilennium Exp $
+# $Id: smeserver-spamassassin.spec,v 1.15 2021/02/19 05:56:55 jpp Exp $
 
 Summary: SME Server - spamassassin anti-spam module
 %define name smeserver-spamassassin
 Name: %{name}
 %define version 2.7.0
-%define release 1
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-#Patch0: smeserver-spamassassin-2.7.0-bz12345-some.patch
+Patch0: smeserver-spamassassin-2.7.0-bz11166-update.patch
+Patch1: smeserver-spamassassin-2.7.0-bz11361-spamd-fails.patch
+Patch2: smeserver-spamassassin-2.7.0-bz11362-logging.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-email >= 4.13.0-38
@@ -29,6 +31,7 @@ Requires: e-smith-base >= 4.13.16
 Requires: e-smith-qmail >= 1.9.0-09sme02
 Requires: smeserver-clamav >= 2.7.0
 Requires: perl-Razor-Agent
+Requires: DCC
 Requires: pyzor
 Obsoletes: FuzzyOcr
 Obsoletes: e-smith-spamassassin
@@ -41,6 +44,16 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
+* Thu Feb 18 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-5.sme
+- fix spamd unable to load [SME: 11361]
+- redirect spamd loging to spamd.log instead of message [SME: 11362]
+
+* Wed Feb 17 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-4.sme
+- add requires DCC as we have built it  [SME: 11065]
+
+* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-3.sme
+- fix smeserver-spamassassin-update event fix [SME: 11166]
+
 * Wed Dec 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 2.7.0-1
 - Start systemd migration. Remove symlinks [SME: 11224]
 - remove refresh clam as this will be provided by clamav
@@ -448,7 +461,11 @@ SME Server - spamassassin anti-spam modu
 
 %prep
 %setup
-#%patch0 -p1
+%patch0 -p1
+%patch1 -p1
+rm -rf root/etc/e-smith/templates/usr/
+rm -rf root//usr/lib/systemd/system/spamd.service.d
+%patch2 -p1
 
 %build
 perl createlinks
@@ -490,5 +507,7 @@ if [[ ! -d /var/lib/spamassassin/3.00400
   fi
 fi
 
+rm -rf /usr/lib/systemd/system/spamd.service.d 2>/dev/null || true
+
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)