--- rpms/e-smith-email/sme7/e-smith-email.spec	2008/01/22 14:47:16	1.4.2.1
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2008/02/14 21:48:26	1.4.2.3
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - em
 %define name e-smith-email
 Name: %{name}
 %define version 4.16.0
-%define release 23
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -29,8 +29,11 @@ Patch17: e-smith-email-4.16.0-uriencode.
 Patch18: e-smith-email-4.16.0-spamreject.patch
 Patch19: e-smith-email-4.16.0-purge-junkmail.patch
 Patch20: e-smith-email-4.17.0-VisibleInternal.patch
+Patch21: e-smith-email-4.16.0-rmDuplicates.patch
+Patch22: e-smith-email-4.16.0-tags2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
+Requires: e-smith-formmagick >= 1.4.0-9
 Requires: e-smith-tinydns >= 1.0.0-5
 Requires: e-smith-smtpd
 Requires: e-smith-mta
@@ -52,6 +55,12 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Thu Feb 14 2008 Gavin Weight <gweight@gmail.com> 4.16.0-25
+- Backport remove <base> tags now in general. [SME: 3917]
+
+* Sun Feb 10 2008 Gavin Weight <gweight@gmail.com> 4.16.0-24
+- Backport remove duplicates <base> entries. [SME: 3892]
+
 * Thu Jan 17 2008 Federico Simoncelli <federico.simoncelli@gmail.com> 4.16.0-23
 - add visible internal toggle to pseudonym panel [SME: 3497]
 
@@ -1321,6 +1330,8 @@ e-smith server and gateway software - em
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %build
 perl createlinks