--- rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2017/06/28 18:41:51	1.9
+++ rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2020/12/16 16:21:20	1.10
@@ -1,22 +1,21 @@
-# $Id: smeserver-spamassassin.spec,v 1.8 2017/03/08 14:29:38 vip-ire Exp $
+# $Id: smeserver-spamassassin.spec,v 1.9 2017/06/28 18:41:51 unnilennium Exp $
 
 Summary: SME Server - spamassassin anti-spam module
 %define name smeserver-spamassassin
 Name: %{name}
-%define version 2.6.0
-%define release 8
+%define version 2.7.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Patch0: smeserver-spamassassin-2.6.0-add_detailed_header.patch
-Patch1: smeserver-spamassassin-2.6.0-allow_tell.patch
-Patch2: smeserver-spamassassin-2.6.0-bz8160-auto_learn.patch
+#Patch0: smeserver-spamassassin-2.7.0-bz12345-some.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-email >= 4.13.0-38
 Requires: headermatch
-Requires: spamassassin >= 3.3.0
+Requires: spamassassin >= 3.4.4
 Requires: perl(Crypt::OpenSSL::Bignum)
 Requires: perl(IO::Socket::INET6)
 Requires: perl(IP::Country)
@@ -28,6 +27,7 @@ Requires: ucspi-tcp daemontools
 Requires: e-smith-lib >= 1.13.1-90
 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: pyzor
 Obsoletes: FuzzyOcr
@@ -41,6 +41,11 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
+* 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
+- require spamassassin 3.4.4 +
+
 * Wed Jun 28 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
 - disable auto_learn by default when enabling Bayes [SME: 8160]
 - added properties UseBayesAutoLearn, BayesAutoLearnThresholdSpam and BayesAutoLearnThresholdNonSpam
@@ -443,9 +448,7 @@ SME Server - spamassassin anti-spam modu
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch0 -p1
 
 %build
 perl createlinks
@@ -455,18 +458,12 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-%{release}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-    --dir /var/service/spamd 'attr(01755,root,root)' \
-    --file /var/service/spamd/down 'attr(0644,root,root)' \
-    --file /var/service/spamd/run 'attr(0755,root,root)' \
-    --dir /var/service/spamd/log 'attr(0755,root,root)' \
-    --dir /var/service/spamd/log/supervise 'attr(0700,root,root)' \
-    --dir /var/service/spamd/supervise 'attr(0700,root,root)' \
-    --file /var/service/spamd/log/run 'attr(0755,root,root)' \
     --dir /var/log/spamd 'attr(2750,smelog,smelog)' \
     --dir /var/spool/spamd 'attr(2750,spamd,spamd)' \
     --dir /var/spool/spamd/.spamassassin 'attr(2750,spamd,spamd)' \
     --file /etc/cron.hourly/sa-restart 'attr(0755,root,root)' \
-    --file /usr/bin/refreshclam 'attr(0755,root,root)' \
+    --dir /usr/lib/systemd/system/spamd.service.d 'attr(0755,root,root)' \
+    --dir /usr/lib/systemd/system/spamassassin.service.d 'attr(0755,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 
 %pre
@@ -478,5 +475,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 
+# Cleanup old files
+rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
+
+if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
+  echo "Installing new spam databases - please be patient"
+  nc -z 8.8.8.8 53  >/dev/null 2>&1
+  online=$?
+  if [ $online -eq 0 ]; then
+      echo "Server Online - updating"
+      /usr/bin/sa-update -v
+  else
+      echo "Offline - please check your network connection and then run sa-update manually"
+  fi
+fi
+
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)