--- rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/03/18 17:05:54	1.7
+++ rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/04/30 18:13:50	1.12
@@ -2,7 +2,7 @@ Summary: SME Server module to configure
 %define name smeserver-clamav
 Name: %{name}
 %define version 1.2.0
-%define release 19
+%define release 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -24,15 +24,20 @@ Patch12: smeserver-clamav-1.2.0-entire.p
 Patch13: smeserver-clamav-1.2.0-rmWeekly.patch
 Patch14: smeserver-clamav-1.2.0-tags2general.patch
 Patch15: smeserver-clamav-1.2.0-clamver.patch
+Patch16: smeserver-clamav-1.2.0-MoveCronTemplate.patch
+Patch17: smeserver-clamav-1.2.0-clamav93.patch
+Patch18: smeserver-clamav-1.2.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-lib
-Requires: clamav >= 0.90
-Requires: clamd >= 0.90
+Requires: clamav >= 0.93
+Requires: clamd >= 0.93
 Requires: clamav-db
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Provides: e-smith-clamav
 Obsoletes: e-smith-clamav
+Obsoletes: clamav-es
+Obsoletes: clamav-es-libs
 BuildRequires: e-smith-devtools
 
 %description
@@ -40,6 +45,23 @@ e-smith server enhancement to configure
 freshclam
 
 %changelog
+* Wed Apr 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-20
+- Remove /etc/cron.d/clamav causing second instance of clamav to run [SME: 4266]
+  which was caused by a partial migration of the template fragments [SME: 1047]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-23
+- Add common <base> tags to e-smith-formmagick's general [SME: 4288]
+
+* Fri Apr 25 2008 Charlie Brady <charlie_brady@mitel.com> 1.2.0-22
+- Add Obsoletes headers to force removal of clamav-es and
+  clamav-es-libs. [SME 4167]
+
+* Fri Apr 18 2008 Shad L. Lords <slords@mail.com> 1.2.0-21
+- Update defaults for clamav 0.93 [SME: 4223]
+
+* Fri Apr 18 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-20
+- Move cron template from cron.d to crontab [SME: 1047]
+
 * Tue Mar 18 2008 Shad L. Lords <slords@mail.com> 1.2.0-19
 - Fix clamav version string [SME: 4060]
 
@@ -294,6 +316,9 @@ freshclam
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %build
 perl createlinks
@@ -306,6 +331,7 @@ mkdir -p root/var/spool/clamav/quarantin
 %pre
 
 %post
+rm -f /etc/cron.d/clamav
 
 %install
 rm -rf $RPM_BUILD_ROOT