--- rpms/e-smith-email/sme8/e-smith-email.spec	2008/01/09 22:23:26	1.5
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2010/04/03 17:10:07	1.19
@@ -1,15 +1,20 @@
+# $Id: e-smith-email.spec,v 1.18 2010/03/29 14:45:08 filippocarletti Exp $
+
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
-%define version 4.17.0
-%define release 4
+%define version 5.2.0
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-email-4.17.0-SSL_port.patch
-Patch1: e-smith-email-4.17.0-VisibleInternal.patch
+Patch1: e-smith-email-5.2.0-localonly.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -24,6 +29,7 @@ Requires: perl(Net::SMTP::SSL)
 Requires: perl(Authen::SASL)
 Requires: perl(Net::Server) >= 0.85
 Requires: runit
+Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: e-smith-smtp-authentication
 Obsoletes: e-smith-securemail
 BuildRequires: e-smith-devtools >= 1.13.0-03
@@ -34,6 +40,49 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* 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
+- Use HeloHost (if present) in smtp-auth-proxy.pl [SME: 5680]
+
+* Wed Nov 4 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-3.sme
+- Allow for changing SPAM subject tag through server-manager [SME: 5559]
+
+* Wed Oct 29 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
+- Fix 'Allow private' to be correct string [SME: 4731]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.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]
+
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> 4.18.0-2
+- Cleanup CREATE/ADD tag mixup [SME: 4045]
+
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> 4.18.0-1
+- Roll stable stream for release.
+
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> 4.18.0-1
+- Roll stable stream for release.
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 4.17.0-6
+- Remove <base> tags now in general [SME: 3917]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 4.17.0-5
+- Remove duplicate <base> entries [SME: 3892]
+
 * Wed Jan 09 2008 Stephen Noble <support@dungog.net>4.17.0-4
 - add visible internal toggle to pseudonym panel [SME: 3497]
 
@@ -1292,8 +1341,11 @@ e-smith server and gateway software - em
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks