--- rpms/e-smith-email/sme8/e-smith-email.spec	2010/04/03 17:10:07	1.19
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2011/09/23 13:45:45	1.31
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.18 2010/03/29 14:45:08 filippocarletti Exp $
+# $Id: e-smith-email.spec,v 1.30 2010/11/20 21:04:53 wellsi Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.2.0
-%define release 6
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,12 @@ Patch2: e-smith-email-5.2.0-spamsubject.
 Patch3: e-smith-email-5.2.0-HeloHost.patch
 Patch4: e-smith-email-5.2.0-blocksmtp.patch
 Patch5: e-smith-email-5.2.0-HeloHost.patch2
+Patch6: e-smith-email-5.2.0-zero-to-disabled.patch
+Patch7: e-smith-email-5.2.0-transparent.patch
+Patch8: e-smith-email-5.2.0-force_relay.patch
+Patch9: e-smith-email-5.2.0-smtp-auth.patch
+Patch10: e-smith-email-5.2.0-prop_merge.patch
+Patch11: e-smith-email-5.2.0-smtp-auth-wording.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -40,6 +46,33 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Fri Sep 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
+- Fix SMTP auth wording in server-manager [SME: 6320]
+
+* Sat Nov 20 2010 Ian Wells <esmith@wellsi.com> 5.2.0-14.sme
+- SME 8.0 Changelog Cleanup [SME: 6368]
+
+* Sun Oct 31 2010 Shad L. Lords <slords@mail.com> 5.2.0-13.sme
+- Fix property merge when local pseudonym is set [SME: 6370]
+
+* Sun Oct 31 2010 Shad L. Lords <slords@mail.com> 5.2.0-12.sme
+- Add smtp auth into web interface, not just when enabled [SME: 6318]
+
+* Mon Oct 4 2010 Shad L. Lords <slords@mail.com> 5.2.0-11.sme
+- Enable auth for smtp traffic and migrate if necessary [SME: 5575]
+
+* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-10.sme
+- Change enabled to transparent for mail proxy [SME: 5574]
+
+* Tue May 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
+- Fix migrate fragment [SME: 5922]
+
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
+- Fix errors in previous commit [SME: 5922]
+
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-7.sme
+- Set smtp-auth-proxy Debug property to disabled instead of 0 [SME: 5922]
+
 * Sat Apr  3 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-6.sme
 - Fix HeloHost patch. [SME: 5854]
 
@@ -1346,6 +1379,12 @@ e-smith server and gateway software - em
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks