--- rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/02/17 18:47:38	1.13
+++ rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/02/22 04:17:46	1.19
@@ -1,16 +1,19 @@
-# $Id: smeserver-spamassassin.spec,v 1.12 2021/01/08 19:49:49 jpp Exp $
+# $Id: smeserver-spamassassin.spec,v 1.18 2021/02/22 04:04:24 jpp Exp $
 
 Summary: SME Server - spamassassin anti-spam module
 %define name smeserver-spamassassin
 Name: %{name}
 %define version 2.7.0
-%define release 4
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 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
+Patch3: smeserver-spamassassin-2.7.0-bz11375-remove-spamd.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-email >= 4.13.0-38
@@ -42,6 +45,19 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
+* Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-7.sme
+- remove spamd reference as service use spamassassin.service [SME: 11375]
+  migrate spamd propertie SpamLearning to spamassassin
+  template for /etc/sysconfig/spamassassin, revert --allow-tell option
+  stop spamassassin spamd and delete /etc/systemd/system/spamassassin.service link if exists
+
+* Sun Feb 21 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-6.sme
+- fix typo [SME: 11361]
+
+* 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]
 
@@ -456,6 +472,12 @@ SME Server - spamassassin anti-spam modu
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+rm -rf root/etc/e-smith/templates/usr/
+rm -rf root//usr/lib/systemd/system/spamd.service.d
+%patch2 -p1
+rm -rf root/etc/e-smith/db/configuration/defaults/spamd
+%patch3 -p1
 
 %build
 perl createlinks
@@ -476,6 +498,15 @@ rm -f %{name}-%{version}-%{release}-file
 %pre
 /sbin/e-smith/create-system-user spamd 1005 \
     'spamassassin daemon user' /var/spool/spamd /bin/false
+#clean 10.0b1 bad choice
+if [[ -L "/etc/systemd/system/spamassassin.service" ]]; then 
+	echo "unlink /etc/systemd/system/spamassassin.service"; fi
+if [[ -L "/usr/lib/systemd/system/spamassassin.service" ]]; then
+	/usr/bin/systemctl stop spamd.service
+	/usr/bin/systemctl stop spamassassin.service
+fi
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -497,5 +528,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)