--- rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/04/25 19:27:19	1.9
+++ rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/08/10 15:51:21	1.15
@@ -2,7 +2,7 @@ Summary: SME Server module to configure
 %define name smeserver-clamav
 Name: %{name}
 %define version 1.2.0
-%define release 22
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,13 +26,16 @@ Patch14: smeserver-clamav-1.2.0-tags2gen
 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
+Patch19: smeserver-clamav-1.2.0-crontab.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-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
@@ -44,6 +47,18 @@ e-smith server enhancement to configure
 freshclam
 
 %changelog
+* Sun Aug 10 2008 Shad L. Lords <slords@mail.com> 1.2.0-25
+- Remove links to crontab in all but clamav-update [SME: 4494]
+
+* Wed Apr 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-24
+- Remove any /etc/cron.d/clamav file. We moved the content to /etc/crontab
+  [SME: 1047], but we need to remove any leftover file from earlier template
+  expansion, which, if present, could cause the nightly file scanning to be
+  run twice. [SME: 4266]
+
+* 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]
@@ -310,6 +325,8 @@ freshclam
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 perl createlinks
@@ -322,6 +339,7 @@ mkdir -p root/var/spool/clamav/quarantin
 %pre
 
 %post
+rm -f /etc/cron.d/clamav
 
 %install
 rm -rf $RPM_BUILD_ROOT