--- rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec	2009/10/29 20:27:16	1.23
+++ rpms/smeserver-qpsmtpd/sme8/smeserver-qpsmtpd.spec	2010/06/05 15:09:40	1.30
@@ -1,16 +1,20 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.22 2008/10/07 15:06:55 slords Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.29 2009/12/27 12:02:13 snetram Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.2.0
-%define release 2
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-qpsmtpd-2.2.0-qpsmtpd83.patch
+Patch2: smeserver-qpsmtpd-2.2.0-spamsubject.patch
+Patch3: smeserver-qpsmtpd-2.2.0-expand-template.patch
+Patch4: smeserver-qpsmtpd-2.2.0-RequireResolvableFromHost-default-enabled.patch
+Patch5: smeserver-qpsmtpd-2.2.0-tls_before_auth.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.83
 Requires: perl(Mail::DKIM)
@@ -41,6 +45,22 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Sat Jun 5 2010 Ian Wells <esmith@wellsi.com> 2.2.0-7.sme
+- Add qpsmtpd template fragment for tls_before_auth [SME: 6004]
+
+* Sun Dec 27 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Enable qpsmtpd RequireResolvableFromHost plugin by default, remove 
+  database entry and the database default value [SME: 5617]
+
+* Sat Nov 7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+- Tie template fragment into event system to have it expanded [SME: 5031]
+
+* Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme
+- Add qpsmtpd template fragment for custom SPAM subject prefix [SME: 5031]
+
+* Thu Oct 29 2009 Shad L. Lords <slords@mail.com> 2.0.0-3.sme
+- Add hooks cleanout back in in so auth works.
+
 * Thu Oct 29 2009 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
 - Add compatibility with qpsmtpd 0.83 [SME: 5543]
 - Add tls to base config [SME: 1076]
@@ -638,6 +658,10 @@ SME Server qpsmtpd smtpd module
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks