--- rpms/e-smith-email/sme8/e-smith-email.spec	2008/01/09 22:23:26	1.5
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2008/02/13 22:51:45	1.7
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - em
 %define name e-smith-email
 Name: %{name}
 %define version 4.17.0
-%define release 4
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,6 +10,8 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: e-smith-email-4.17.0-SSL_port.patch
 Patch1: e-smith-email-4.17.0-VisibleInternal.patch
+Patch2: e-smith-email-4.17.0-rmDuplicates.patch
+Patch3: e-smith-email-4.17.0-tags2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -24,6 +26,7 @@ Requires: perl(Net::SMTP::SSL)
 Requires: perl(Authen::SASL)
 Requires: perl(Net::Server) >= 0.85
 Requires: runit
+Requires: e-smith-formmagick >= 1.4.0-9
 Obsoletes: e-smith-smtp-authentication
 Obsoletes: e-smith-securemail
 BuildRequires: e-smith-devtools >= 1.13.0-03
@@ -34,6 +37,12 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 4.17.0-6
+- Remove <base> tags now in general [SME: 3917]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 4.17.0-5
+- Remove duplicate <base> entries [SME: 3892]
+
 * Wed Jan 09 2008 Stephen Noble <support@dungog.net>4.17.0-4
 - add visible internal toggle to pseudonym panel [SME: 3497]
 
@@ -1294,6 +1303,8 @@ e-smith server and gateway software - em
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks