--- rpms/qpsmtpd/sme7/qpsmtpd.spec	2009/11/04 17:01:12	1.24
+++ rpms/qpsmtpd/sme7/qpsmtpd.spec	2009/11/05 18:18:12	1.25
@@ -1,8 +1,8 @@
-# $Id: qpsmtpd.spec,v 1.23 2009/11/03 21:53:04 slords Exp $
+# $Id: qpsmtpd.spec,v 1.24 2009/11/04 17:01:12 charliebrady Exp $
 
 Name: qpsmtpd
 Version: 0.83
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
 Summary: qpsmtpd + qpsmtpd-apache + qpsmtpd-async
 License: distributable
 Group: System Environment/Daemons
@@ -23,6 +23,8 @@ Source6: qpsmtpd.conf
 Source7: README.selinux
 
 Patch10: qpsmtpd-0.83-loginit.patch
+Patch11: qpsmtpd-48d1a5b9febc96d2d3c4110500759e36fb4eabb6.patch
+Patch12: qpsmtpd-de3fbb565f711bc27e7bfa061e83c3020710dc16.patch
 
 Patch100: qpsmtpd-0.40-badrcptto_allowrelay.patch
 Patch101: qpsmtpd-0.83-peer_hooks.patch
@@ -59,6 +61,8 @@ qpsmpd-async which uses it.
 %prep
 %setup -q
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -172,6 +176,10 @@ then
 fi
 
 %changelog
+* Thu Nov 5 2009 <smeserver-contribs@snetram.nl> 0.83-0.6.sme
+- Apply qpsmtpd git changesets to implement custom SPAM
+  subject prefix [SME: 5567]
+
 * Tue Nov 3 2009 <slords@lordsfam.net> 0.83-0.5.sme
 - Update pre requires so scripts don't fail on install [SME: 5557]