--- rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/01/07 19:18:13	1.4
+++ rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/10/07 15:36:01	1.17
@@ -1,41 +1,70 @@
+# $Id$
+
 Summary: SME Server module to configure clamav
 %define name smeserver-clamav
 Name: %{name}
-%define version 1.2.0
-%define release 16
+%define version 2.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-clamav-ArchiveBlockEncrypted.patch
-Patch1: smeserver-clamav-1.2.0-exclude_arg.patch
-Patch2: smeserver-clamav-1.2.0-RestrictScan.patch
-Patch3: smeserver-clamav-1.2.0-ParamsAndOutput.patch
-Patch4: smeserver-clamav-1.2.0-feedback.patch
-Patch5: smeserver-clamav-1.2.0-feedback.patch2
-Patch6: smeserver-clamav-1.2.0-feedback.patch3
-Patch7: smeserver-clamav-1.2.0-version90.patch
-Patch8: smeserver-clamav-1.2.0-memlimit.patch
-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
 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
+* 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]
+
+* 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]
 
@@ -265,19 +294,6 @@ freshclam
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 %build
 perl createlinks
@@ -290,6 +306,7 @@ mkdir -p root/var/spool/clamav/quarantin
 %pre
 
 %post
+rm -f /etc/cron.d/clamav
 
 %install
 rm -rf $RPM_BUILD_ROOT