--- rpms/e-smith-email/sme7/e-smith-email.spec	2008/02/10 12:17:47	1.7
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2008/04/28 19:19:19	1.12
@@ -1,16 +1,15 @@
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
-%define version 4.17.0
-%define release 5
+%define version 4.18.0
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 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
+Patch1: e-smith-email-4.18.0-fixADD.patch
+Patch2: e-smith-email-4.18.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -25,6 +24,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-12
 Obsoletes: e-smith-smtp-authentication
 Obsoletes: e-smith-securemail
 BuildRequires: e-smith-devtools >= 1.13.0-03
@@ -35,6 +35,21 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.0-3
+- Add common <base> tags to e-smith-formmagick's general [SME: 4285]
+
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> 4.18.0-2
+- Cleanup CREATE/ADD tag mixup [SME: 4045]
+
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> 4.18.0-1
+- Roll stable stream for release.
+
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> 4.18.0-1
+- Roll stable stream for release.
+
+* 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]
 
@@ -1296,7 +1311,6 @@ e-smith server and gateway software - em
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1