--- rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/10/07 15:36:01	1.17
+++ rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2010/06/09 21:09:33	1.30
@@ -1,25 +1,33 @@
-# $Id$
+# $Id: smeserver-clamav.spec,v 1.29 2010/06/05 19:21:41 wellsi Exp $
 
 Summary: SME Server module to configure clamav
 %define name smeserver-clamav
 Name: %{name}
 %define version 2.0.0
-%define release 1
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
+Patch0: smeserver-clamav-2.0.0-HeuristicScanPrecedence.patch
+Patch1: smeserver-clamav-2.0.0-fixperm.patch
+Patch2: smeserver-clamav-2.0.0-logrotate.patch
+Patch3: smeserver-clamav-2.0.0-nocreate.patch
+Patch4: smeserver-clamav-2.0.0-logrotate.patch2
+Patch5: smeserver-clamav-2.0.0-MemLimit.patch
+Patch6: smeserver-clamav-2.0.0-crondaily.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-lib
 Requires: e-smith-base
-Requires: clamav >= 0.93
-Requires: clamd >= 0.93
+Requires: clamav >= 0.94
+Requires: clamd >= 0.94
 Requires: clamav-db
 Requires: e-smith-formmagick >= 1.4.0-12
 Provides: e-smith-clamav
 Obsoletes: e-smith-clamav
+Obsoletes: e-smith-antivirus
 Obsoletes: clamav-es
 Obsoletes: clamav-es-libs
 BuildRequires: e-smith-devtools
@@ -28,6 +36,40 @@ BuildRequires: e-smith-devtools
 SME Server enhancement to configure and run clamd and freshclam
 
 %changelog
+* Wed Jun 9 2010 Ian Wells <esmith@wellsi.com> 2.0.0-12.sme
+- Re-work patch to improve and document template [SME: 4297]
+
+* Sat Jun 5 2010 Ian Wells <esmith@wellsi.com> 2.0.0-11.sme
+- correct createlinks for /etc/cron.daily/freshclam again [SME: 4297]
+
+* Sat Jun 5 2010 Ian Wells <esmith@wellsi.com> 2.0.0-10.sme
+- correct createlinks for /etc/cron.daily/freshclam [SME: 4297]
+
+* Thu Jun 3 2010 Ian Wells <esmith@wellsi.com> 2.0.0-9.sme
+- template /etc/cron.daily/freshclam, and make it a NO-OP [SME: 4297]
+
+* Sun Apr 18 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-8.sme
+- Increase MemLimit to 600M for clamav-0.96 [SME: 5649]
+
+* Sat Feb 6 2010 Stephen Noble <support@dungog.net> 2.0.0-7.sme
+- Setup logrotate for /var/log/clamd/clamscan.log  [SME: 5287]
+
+* Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-6.sme
+- Remove create option from logrotate configuration [SME: 5287]
+
+* Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-5.sme
+- Setup logrotate for /var/log/clamd/smeserver-clamscan.log [SME: 5287]
+- Minor changelog fixes in version number
+
+* Tue Jun 2 2009 Shad L. Lords <slords@mail.com> 2.0.0-4.sme
+- Fix permissions on freshclam.conf file [SME: 5320]
+
+* Mon Apr 13 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-3.sme
+- Add HeuristicScanPrecedence option, default disabled [SME: 4598]
+
+* Thu Nov 27 2008 Stephen Noble <support@dungog.net> 2.0.0-2.sme
+- Obsolete e-smith-antivirus [SME: 4786]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -294,6 +336,13 @@ SME Server enhancement to configure and
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks