--- rpms/e-smith-email/sme8/e-smith-email.spec	2010/09/26 16:28:36	1.25
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2011/09/24 07:31:50	1.32
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.24 2010/05/08 19:20:42 snetram Exp $
+# $Id: e-smith-email.spec,v 1.31 2011/09/23 13:45:45 snetram Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.2.0
-%define release 10
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,6 +17,11 @@ Patch4: e-smith-email-5.2.0-blocksmtp.pa
 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
+Patch12: e-smith-email-5.2.0-add-cdata-tag.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -42,6 +47,24 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Fri Sep 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
+- Fix previous commit to show complete text in server-manager  [SME: 6320]
+
+* 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]
 
@@ -1362,6 +1385,11 @@ e-smith server and gateway software - em
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 perl createlinks