--- rpms/e-smith-email/sme7/e-smith-email.spec	2007/06/12 15:27:27	1.1
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2008/03/11 17:12:07	1.9
@@ -1,31 +1,13 @@
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
-%define version 4.16.0
-%define release 20
+%define version 4.18.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-email-4.16.0-lexiconfixup.patch 
-Patch1: e-smith-email-4.16.0-danglingpseudonyms.patch
-Patch2: e-smith-email-4.16.0-relay_ehlo.patch
-Patch3: e-smith-email-4.16.0-relay_ehlo.patch2
-Patch4: e-smith-email-4.16.0-removeIMPfragment.patch
-Patch5: e-smith-email-4.16.0-TVp1AQEAAAAE.patch
-Patch6: e-smith-email-4.16.0-virustextupdated.patch
-Patch7: e-smith-email-4.16.0-purge-junkmail-folders.patch
-Patch8: e-smith-email-4.16.0-TVqgAAEAAAAFAAAA.patch
-Patch9: e-smith-email-4.16.0-RelaxedEmailCheck.patch
-Patch10: e-smith-email-4.16.0-removable.patch
-Patch11: e-smith-email-4.16.0-Returntosendertextupdated.patch
-Patch12: e-smith-email-4.16.0-fetchmaildest.patch
-Patch13: e-smith-email-4.16.0-adminemail.patch
-Patch14: e-smith-email-4.16.0-RelaxedEmailCheck3.patch
-Patch15: e-smith-email-4.16.0-adminemail.patch2
-Patch16: e-smith-email-4.16.0-uriencode.patch
-Patch17: e-smith-email-4.16.0-uriencode.patch2
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -36,9 +18,11 @@ Requires: e-smith-imap
 Requires: e-smith-lib >= 1.15.1-19
 Requires: perl(Net::Server::Fork)
 Requires: perl(Net::SMTP)
+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
@@ -49,6 +33,34 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* 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]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net>4.17.0-4
+- add visible internal toggle to pseudonym panel [SME: 3497]
+
+* Thu Dec 27 2007 Shad L. Lords <slords@mail.com> 4.17.0-3
+- Remove leading 0 from release
+
+* Wed Dec 26 2007 Charlie Brady <charlie_brady@mitel.com> 4.17.0-02
+- Add support for SMTPS and MSA outbound authenticated SMTP to
+  smarthost. TODO: Add panel support. [SME: 897]
+
+* Wed Dec 26 2007 Charlie Brady <charlie_brady@mitel.com> 4.17.0-01
+- Make new development branch.
+
+* Mon Jun 25 2007 Charlie Brady <charlie_brady@mitel.com> 4.16.0-22
+- Add diagnostic if .junkmail Maildir is broken. [SME: 2739]
+
+* Tue Jun 12 2007 Shad L. Lords <slords@mail.com> 4.16.0-21
+- Add default to SpamReject to get rid of warnings [SME: 2395]
+
 * Mon Jun 11 2007 Shad L. Lords <slords@mail.com> 4.16.0-20
 - decode parameters so pseudonymn can be modified/deleted [SME: 1782]
 
@@ -1288,24 +1300,6 @@ e-smith server and gateway software - em
 
 %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
 
 %build
 perl createlinks