--- rpms/e-smith-email/sme7/e-smith-email.spec	2008/02/13 22:51:45	1.8
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2011/03/15 09:52:14	1.26
@@ -1,17 +1,21 @@
+# $Id: e-smith-email.spec,v 1.25 2011/03/11 18:22:51 bytegw Exp $
+
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
-%define version 4.17.0
-%define release 6
+%define version 5.0.0
+%define release 9
 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
-Patch3: e-smith-email-4.17.0-tags2general.patch
+Patch1: e-smith-email-5.0.0-localonly.patch
+Patch2: e-smith-email-5.0.0-HeloHost.patch
+Patch3: e-smith-email-5.0.0-HeloHost2.patch
+Patch4: e-smith-email-5.0.0-zero-to-disabled.patch
+Patch5: e-smith-email-5.0.0-FixLocalNetworkOnlyBox.patch
+Patch6: e-smith-email-5.0.0-FixLocalNetworkOnlyBoxTypo.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -26,7 +30,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
+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
@@ -37,6 +41,52 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Tue Mar 15 2011 Gavin Weight <gweight@gmail.com> 5.0.0-9.sme
+- Fix typo with merge_props in Pseudonym. [SME: 6361]
+
+* Fri Mar 11 2011 Gavin Weight <gweight@gmail.com> 5.0.0-8.sme
+- Fix Pseudonym "local network only" to merge multiple properties. [SME: 6361]
+
+* Tue May 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-7.sme
+- Fix migrate fragment [SME: 5921]
+
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-6.sme
+- Fix errors in previous commit [SME: 5921]
+
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-5.sme
+- Set smtp-auth-proxy Debug property to disabled instead of 0 [SME: 5921]
+
+* Mon May 3 2010 Ian Wells <esmith@wellsi.com> 5.0.0-4.sme
+- Fix HeloHost patch. [SME: 5670]
+
+* Mon Dec 21 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.0.0-3.sme
+- Use HeloHost (if present) in smtp-auth-proxy.pl [SME: 5670]
+
+* Wed Oct 29 2008 Shad L. Lords <slords@mail.com> 5.0.0-2.sme
+- Fix 'Allow private' to be correct string [SME: 4731]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Mon Jul 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.0-5
+- Fix patch to be in accordance with conventions in e-smith-formagick's general [SME: 4285]
+
+* Sat Jul 26 2008 Gavin Weight <gweight@gmail.com> 4.18.0-4
+- Fix pseudonyms modify if using special characters. Thanks - 
+  Federico Simoncelli. [SME: 4346]
+
+* 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]
 
@@ -1301,10 +1351,12 @@ e-smith server and gateway software - em
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks