--- rpms/e-smith-email/sme7/e-smith-email.spec	2010/05/04 18:58:58	1.19
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2011/03/15 09:52:14	1.26
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.18 2010/05/03 14:37:06 wellsi Exp $
+# $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 5.0.0
-%define release 5
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,8 @@ Patch1: e-smith-email-5.0.0-localonly.pa
 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
@@ -39,7 +41,19 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
-* Tue May 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-5.sme
+* 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
@@ -1341,6 +1355,8 @@ e-smith server and gateway software - em
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks