--- rpms/e-smith-email/sme8/e-smith-email.spec	2010/03/29 14:45:08	1.18
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2010/05/04 19:53:58	1.22
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.17 2010/02/13 02:49:20 dungog Exp $
+# $Id: e-smith-email.spec,v 1.21 2010/05/04 19:03:22 snetram Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.2.0
-%define release 5
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,8 @@ Patch1: e-smith-email-5.2.0-localonly.pa
 Patch2: e-smith-email-5.2.0-spamsubject.patch
 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
 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,16 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
-* Thu Mar 25 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-2.sme
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-7.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]
+
+* Thu Mar 25 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-5.sme
 - Block by default the SMTP transparent proxy [SME: 5574]
 
 * Mon Dec 21 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-4.sme
@@ -1341,6 +1352,8 @@ e-smith server and gateway software - em
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks