--- rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/04/30 18:57:46	1.14
+++ rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2009/04/13 15:18:12	1.19
@@ -1,50 +1,50 @@
+# $Id: smeserver-clamav.spec,v 1.18 2008/11/26 21:14:35 dungog Exp $
+
 Summary: SME Server module to configure clamav
 %define name smeserver-clamav
 Name: %{name}
-%define version 1.2.0
-%define release 24
+%define version 2.0.0
+%define release 3
 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
-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
+Patch0: smeserver-clamav-2.0.0-HeuristicScanPrecedence.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-lib
-Requires: clamav >= 0.93
-Requires: clamd >= 0.93
+Requires: e-smith-base
+Requires: clamav >= 0.94
+Requires: clamd >= 0.94
 Requires: clamav-db
 Requires: e-smith-formmagick >= 1.4.0-12
 Provides: e-smith-clamav
 Obsoletes: e-smith-clamav
+Obsoletes: e-smith-antivirus
 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 Apr 13 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-3
+- Add HeuristicScanPrecedence option, default disabled [SME: 4598]
+
+* Thu Nov 27 2008 Stephen Noble <support@dungog.net> 2.0.0-2
+- Obsolete e-smith-antivirus [SME: 4786]
+
+* 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
@@ -303,24 +303,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
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
 
 %build
 perl createlinks