--- rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/02/22 04:23:46	1.21
+++ rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/04/07 21:16:20	1.24
@@ -1,10 +1,10 @@
-# $Id: smeserver-spamassassin.spec,v 1.20 2021/02/22 04:19:31 jpp Exp $
+# $Id: smeserver-spamassassin.spec,v 1.23 2021/03/16 20:54:07 jpp Exp $
 
 Summary: SME Server - spamassassin anti-spam module
 %define name smeserver-spamassassin
 Name: %{name}
 %define version 2.7.0
-%define release 7
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -45,6 +45,15 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
+* Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-10.sme
+- prevent noise in log at spamassassin call from qpsmtpd [SME: 11491]
+
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
+- clean rsyslog syntax for spamd [SME: 11422]
+
+* Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-8.sme
+- remove warning while trying to delete file when missing in post script [SME: 11375]
+
 * 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
@@ -478,6 +487,7 @@ rm -rf root//usr/lib/systemd/system/spam
 %patch2 -p1
 %patch3 -p1
 rm -rf root/etc/e-smith/db/configuration/defaults/spamd
+mkdir -p root/var/service/qpsmtpd/.spamassassin
 
 %build
 perl createlinks
@@ -493,6 +503,7 @@ rm -f %{name}-%{version}-%{release}-file
     --file /etc/cron.hourly/sa-restart '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)' \
+    --dir /var/service/qpsmtpd/.spamassassin 'attr(0775,spamd,spamd)' \
     > %{name}-%{version}-%{release}-filelist
 
 %pre
@@ -514,7 +525,9 @@ 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.004000 ]]; then
+  rm -rf /var/lib/spamassassin/3.004000 2>/dev/null || true
+fi
 
 if [[ ! -d /var/lib/spamassassin/3.004004 ]]; then
   echo "Installing new spam databases - please be patient"
@@ -528,7 +541,9 @@ if [[ ! -d /var/lib/spamassassin/3.00400
   fi
 fi
 
-rm -rf /usr/lib/systemd/system/spamd.service.d 2>/dev/null || true
+if [[  -d /usr/lib/systemd/system/spamd.service.d ]]; then
+  rm -rf /usr/lib/systemd/system/spamd.service.d 
+fi
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)