--- rpms/smeserver-spamassassin/sme8/smeserver-spamassassin.spec 2008/11/27 09:10:25 1.8 +++ rpms/smeserver-spamassassin/sme8/smeserver-spamassassin.spec 2014/01/03 05:15:14 1.20 @@ -1,20 +1,26 @@ -# $Id: smeserver-spamassassin.spec,v 1.7 2008/10/07 14:57:14 slords Exp $ +# $Id: smeserver-spamassassin.spec,v 1.19 2013/12/21 06:03:35 wellsi Exp $ Summary: SME Server - spamassassin anti-spam module %define name smeserver-spamassassin Name: %{name} %define version 2.2.0 -%define release 2 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL 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 +Patch5: smeserver-spamassassin-2.2.0-bootstrap-console-save-removal.patch +Patch6: smeserver-spamassassin-2.2.0-pyzor-timeout.patch +Patch8: smeserver-spamassassin-2.2.0-okLanguages.patch +Patch9: smeserver-spamassassin-2.2.0-refreshclam.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: e-smith-email >= 4.13.0-38 Requires: headermatch -Requires: spamassassin >= 3.1.0 +Requires: spamassassin >= 3.3.0 Requires: perl(Crypt::OpenSSL::Bignum) Requires: perl(IO::Socket::INET6) Requires: perl(IP::Country) @@ -29,7 +35,7 @@ Requires: e-smith-qmail >= 1.9.0-09sme02 Requires: razor-agents >= 2.61-1 Requires: DCC Requires: pyzor -Requires: FuzzyOcr +Obsoletes: FuzzyOcr Obsoletes: e-smith-spamassassin Provides: e-smith-spamassassin BuildArchitectures: noarch @@ -40,7 +46,47 @@ AutoReqProv: no SME Server - spamassassin anti-spam module %changelog -* Tue Nov 25 2008 Giacomo Sanchietti 2.2.0-2sme +* Thu Jan 2 2014 Ian Wells 2.2.0-13.sme +- Include /usr/bin/refreshclam [SME: 8107] + +* Fri Dec 20 2013 Ian Wells 2.2.0-12 +- Remove workarounds for how qpsmtpd tags spam email [SME: 8014] + +* Fri Jul 5 2013 Ian Wells 2.2.0-11 +- Load TextCat plugin if ok_languages is enabled [SME: 7048] + +* Sun May 19 2013 chris burnat 2.2.0-10 +- Fix how qpsmtpd tags spam email, codes by Charlie Brady [SME: 5603] + +* Sun Apr 8 2012 Jonathan Martens 2.2.0-9 +- Add template fragment for pyzor timeout [SME: 6896] + +* Fri Jan 20 2012 Jonathan Martens 2.2.0-8 +- Actually apply patch to remove spamd restart from bootstrap-console-save event [SME: 6717] + +* Fri Dec 23 2011 Jonathan Martens 2.2.0-7 +- Remove spamd restart from bootstrap-console-save event [SME: 6717] + +* Sat Aug 7 2010 Ian Wells 2.2.0-6.sme +- Work around how qpsmtpd tags spam email, by Michael McCarn [SME: 5603] + +* Mon Apr 19 2010 Shad L. Lords 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 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 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 2.2.0-2.sme - Fix invalid service name in sa-update [SME: 3304] * Tue Oct 7 2008 Shad L. Lords 2.2.0-1.sme @@ -370,6 +416,12 @@ SME Server - spamassassin anti-spam modu %prep %setup %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch5 -p1 +%patch6 -p1 +%patch8 -p1 +%patch9 -p1 %build perl createlinks @@ -403,6 +455,8 @@ rm -f %{name}-%{version}-%{release}-file --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)' \ > %{name}-%{version}-%{release}-filelist %pre