--- rpms/smeserver-spamassassin/sme8/smeserver-spamassassin.spec	2010/02/17 17:18:12	1.10
+++ 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.9 2010/02/17 11:53:42 filippocarletti 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 4
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,11 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-spamassassin-2.2.0-ServiceNameFix.patch
 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
@@ -41,18 +46,38 @@ AutoReqProv: no
 SME Server - spamassassin anti-spam module
 
 %changelog
-* Wed Feb 17 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-4sme
+* 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]
+
+* Mon Apr 19 2010 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Remove cron.daily jobs that are no longer needed
+- Previous patch make spamassassin restart correctly [SME: 3304]
+- Newer spamassassin imports keys on install [SME: 5889]
+
+* Wed Feb 17 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-4.sme
 - Requires SpamAssassin 3.3.0 [SME: 5741]
 - Remove FuzzyOcr [SME: 5771]
 - Use ATrpm package (partially remove previous patch)
 
-* Tue Feb 16 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-3sme
+* Tue Feb 16 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-3.sme
 - Requires SpamAssassin 3.3.0 [SME: 5741]
 - Remove FuzzyOcr [SME: 5771]
 - Run sa-update every two hours and check restart every hour
 - Redirect cron job output to logfile to avoid mail noise
 
-* Tue Nov 25 2008 Giacomo Sanchietti <giacomo@nethesis.it> 2.2.0-2sme
+* Tue Nov 25 2008 Giacomo Sanchietti <giacomo@nethesis.it> 2.2.0-2.sme
 - Fix invalid service name in sa-update [SME: 3304]
 
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
@@ -383,6 +408,11 @@ SME Server - spamassassin anti-spam modu
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks