--- rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/02/22 04:17:46	1.19
+++ rpms/smeserver-spamassassin/sme10/smeserver-spamassassin.spec	2021/03/16 20:54:07	1.23
@@ -1,10 +1,10 @@
-# $Id: smeserver-spamassassin.spec,v 1.18 2021/02/22 04:04:24 jpp Exp $
+# $Id: smeserver-spamassassin.spec,v 1.22 2021/02/23 17:14:33 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 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -45,6 +45,12 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
+* 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
@@ -476,8 +482,8 @@ SME Server - spamassassin anti-spam modu
 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
+rm -rf root/etc/e-smith/db/configuration/defaults/spamd
 
 %build
 perl createlinks
@@ -500,7 +506,7 @@ rm -f %{name}-%{version}-%{release}-file
     '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
+	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
@@ -514,7 +520,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 +536,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)