--- rpms/e-smith-email/sme7/e-smith-email.spec	2008/04/28 19:19:19	1.12
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2011/03/11 18:18:45	1.23
@@ -1,15 +1,20 @@
+# $Id: e-smith-email.spec,v 1.22 2010/05/08 19:20:42 snetram Exp $
+
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
-%define version 4.18.0
-%define release 3
+%define version 5.0.0
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-email-4.18.0-fixADD.patch
-Patch2: e-smith-email-4.18.0-add2general.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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -35,6 +40,37 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Tue March 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]
 
@@ -1313,6 +1349,9 @@ e-smith server and gateway software - em
 %setup
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks