--- rpms/smeserver-clamav/sme8/smeserver-clamav.spec	2007/09/06 16:14:59	1.2
+++ rpms/smeserver-clamav/sme8/smeserver-clamav.spec	2008/09/22 11:21:28	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 15
+%define release 26
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -20,21 +20,70 @@ Patch8: smeserver-clamav-1.2.0-memlimit.
 Patch9: smeserver-clamav-1.2.0-memlimit.patch2
 Patch10: smeserver-clamav-1.2.0-update-failed-fullpaths.patch
 Patch11: smeserver-clamav-1.2.0-freshclam_perms.patch
+Patch12: smeserver-clamav-1.2.0-entire.patch
+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
+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: clamav >= 0.90
-Requires: clamd >= 0.90
+Requires: e-smith-base
+Requires: clamav >= 0.93
+Requires: clamd >= 0.93
 Requires: clamav-db
+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
-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]
+
+* 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]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.2.0-18
+- Remove <base> tags now in general [SME: 3915]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.2.0-17
+- Remove duplicate <base> entries [SME: 3890]
+
+* Mon Jan 07 2008 Stephen Noble <support@dungog.net> 1.2.0-16
+- Cosmetic removal of word entire on panel [SME: 3483]
+
 * Thu Sep 06 2007  Filippo Carletti <filippo.carletti@gmail.com> 1.2.0-15
 - Fix freshclam.conf permissions [SME: 3375]
 
@@ -273,6 +322,15 @@ freshclam
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 perl createlinks
@@ -285,6 +343,7 @@ mkdir -p root/var/spool/clamav/quarantin
 %pre
 
 %post
+rm -f /etc/cron.d/clamav
 
 %install
 rm -rf $RPM_BUILD_ROOT