--- rpms/qpsmtpd/sme8/qpsmtpd.spec	2009/10/29 17:01:20	1.19
+++ rpms/qpsmtpd/sme8/qpsmtpd.spec	2009/11/05 18:06:59	1.24
@@ -1,8 +1,8 @@
-# $Id: qpsmtpd.spec,v 1.18 2009/10/26 18:30:13 filippocarletti Exp $
+# $Id: qpsmtpd.spec,v 1.23 2009/11/04 16:59:38 charliebrady Exp $
 
 Name: qpsmtpd
 Version: 0.83
-Release: 0.3%{?dist}
+Release: 0.6%{?dist}
 Summary: qpsmtpd + qpsmtpd-apache + qpsmtpd-async
 License: distributable
 Group: System Environment/Daemons
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 BuildRequires: perl >= 0:5.00503
 BuildArchitectures: noarch
 Requires: perl(Mail::Header), perl(Net::DNS) perl(Net::IP)
+Requires(pre): coreutils, shadow-utils, perl
 
 Source0: %{name}-%{version}.tar.gz
 Source1: qpsmtpd-forkserver.rc
@@ -21,6 +22,10 @@ Source5: in.qpsmtpd
 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
 Patch102: qpsmtpd-0.83-clamd_conf.patch
@@ -55,6 +60,9 @@ qpsmpd-async which uses it.
 
 %prep
 %setup -q
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -168,6 +176,17 @@ 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: 5031]
+
+* Tue Nov 3 2009 <slords@lordsfam.net> 0.83-0.5.sme
+- Update pre requires so scripts don't fail on install [SME: 5558]
+
+* Sat Oct 31 2009 <slords@lordsfam.net> 0.83-0.4.sme
+- Rebase bad_rcptto patch to remove orig file [SME: 5548]
+- Change logging in tls init to prevent warnings [SME: 5551]
+
 * Thu Oct 29 2009 <slords@lordsfam.net> 0.83-0.3.sme
 - Only run/initialize plugins once [SME: 5533]
 
@@ -175,10 +194,12 @@ fi
 - Change spool dir permissions and owner to qpsmtpd:clamav
 - Change log dir permissions and owner to smelog:smelog
 
-* Fri Sep 18 2009 <rpmbuild@robinbowes.com> 0.83-0.1.sme
-- Update to 0.83
+* Tue Sep 22 2009 <filippo.carletti@gmail.com> 0.83-0.1.sme
 - add sme specific patches
 
+* Fri Sep 18 2009 <rpmbuild@robinbowes.com> 0.83-0.1
+- Update to 0.83
+
 * Sun Jul 12 2009 <rpmbuild@robinbowes.com> 0.82-0.1
 - Update to latest release
 - don't add qpsmtpd to start-up by default