--- rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/04/28 19:25:37	1.11
+++ rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/09/22 11:16:36	1.16
@@ -2,7 +2,7 @@ Summary: SME Server module to configure
 %define name smeserver-clamav
 Name: %{name}
 %define version 1.2.0
-%define release 23
+%define release 26
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,9 +27,12 @@ Patch15: smeserver-clamav-1.2.0-clamver.
 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
+Patch20: smeserver-clamav-1.2.0-cleanlocale.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
@@ -41,10 +44,21 @@ Obsoletes: clamav-es-libs
 BuildRequires: e-smith-devtools
 
 %description
-e-smith server enhancement to configure and run clamd and
-freshclam
+SME Server enhancement to configure and run clamd and freshclam
 
 %changelog
+* Mon Sep 22 2008 Stephen Noble <support@dungog.net> 1.2.0-26
+- Remove obsolete locale tags [SME: 4235]
+
+* 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]
 
@@ -315,6 +329,8 @@ freshclam
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 perl createlinks
@@ -327,6 +343,7 @@ mkdir -p root/var/spool/clamav/quarantin
 %pre
 
 %post
+rm -f /etc/cron.d/clamav
 
 %install
 rm -rf $RPM_BUILD_ROOT