--- rpms/smeserver-spamassassin/sme8/smeserver-spamassassin.spec	2010/08/07 22:03:06	1.12
+++ rpms/smeserver-spamassassin/sme8/smeserver-spamassassin.spec	2013/05/19 05:45:09	1.17
@@ -1,10 +1,10 @@
-# $Id: smeserver-spamassassin.spec,v 1.11 2010/04/19 14:24:41 slords Exp $
+# $Id: smeserver-spamassassin.spec,v 1.16 2012/04/08 15:12:14 snetram Exp $
 
 Summary: SME Server - spamassassin anti-spam module
 %define name smeserver-spamassassin
 Name: %{name}
 %define version 2.2.0
-%define release 6
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,9 @@ Patch1: smeserver-spamassassin-2.2.0-Ser
 Patch2: smeserver-spamassassin-2.2.0-AWL.patch
 Patch3: smeserver-spamassassin-2.2.0-cronjobs.patch
 Patch4: smeserver-spamassassin-2.2.0-RequiredScore.patch
+Patch5: smeserver-spamassassin-2.2.0-bootstrap-console-save-removal.patch
+Patch6: smeserver-spamassassin-2.2.0-pyzor-timeout.patch
+Patch7: smeserver-spamassassin-2.2.0-fix_10required_score.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-email >= 4.13.0-38
 Requires: headermatch
@@ -43,6 +46,18 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
+* Sun May 19 2013 chris burnat <devlist@burnat.com> 2.2.0-10
+- Reverse changes in 2.2.0-6 and fix how qpsmtpd tags spam email, codes by Charlie Brady [SME: 5603]
+
+* Sun Apr 8 2012 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-9
+- Add template fragment for pyzor timeout [SME: 6896]
+
+* Fri Jan 20 2012 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8
+- Actually apply patch to remove spamd restart from bootstrap-console-save event [SME: 6717]
+
+* Fri Dec 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-7
+- Remove spamd restart from bootstrap-console-save event [SME: 6717]
+
 * Sat Aug 7 2010 Ian Wells <esmith@wellsi.com> 2.2.0-6.sme
 - Work around how qpsmtpd tags spam email, by Michael McCarn [SME: 5603]
 
@@ -395,6 +410,9 @@ SME Server - spamassassin anti-spam modu
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks