--- rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/04/18 17:06:59	1.8
+++ rpms/smeserver-clamav/sme7/smeserver-clamav.spec	2008/04/26 22:08:57	1.10
@@ -2,7 +2,7 @@ Summary: SME Server module to configure
 %define name smeserver-clamav
 Name: %{name}
 %define version 1.2.0
-%define release 21
+%define release 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,6 +26,7 @@ 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-lib
@@ -35,6 +36,8 @@ Requires: clamav-db
 Requires: e-smith-formmagick >= 1.4.0-9
 Provides: e-smith-clamav
 Obsoletes: e-smith-clamav
+Obsoletes: clamav-es
+Obsoletes: clamav-es-libs
 BuildRequires: e-smith-devtools
 
 %description
@@ -42,6 +45,13 @@ e-smith server enhancement to configure
 freshclam
 
 %changelog
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-23
+- Add common <base> tags to e-smith-formmagick's general
+
+* 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]
 
@@ -304,6 +314,7 @@ freshclam
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 perl createlinks