--- rpms/qpsmtpd/sme8/qpsmtpd.spec	2007/06/14 20:07:19	1.2
+++ rpms/qpsmtpd/sme8/qpsmtpd.spec	2007/10/17 13:50:23	1.11
@@ -1,6 +1,6 @@
 Name: qpsmtpd
 Version: 0.40
-Release: 1.0%{?dist}
+Release: 1.7%{?dist}
 %define orig_version 0.40
 Summary: qpsmtpd
 License: distributable
@@ -30,6 +30,10 @@ Patch100: qpsmtpd-0.40-badhelo_disconnec
 Patch101: qpsmtpd-0.40-badrcptto_allowrelay.patch
 Patch102: qpsmtpd-0.40-clamav_fix.patch
 Patch103: qpsmtpd-0.40-peer_hooks.patch
+Patch104: qpsmtpd-0.40-clamd_conf.patch
+Patch105: qpsmtpd-0.40-denysoft.patch
+Patch106: qpsmtpd-0.40-clamav-headers.patch
+Patch107: qpsmtpd-0.40-rhsbl_disconnect.patch
 
 %description
 qpsmtpd is a flexible smtpd daemon written in Perl. Apart from the core
@@ -72,8 +76,12 @@ qpsmpd-async which uses it.
 #%patch8 -p0 -b .dns-random-id
 %patch100 -p1
 %patch101 -p1
-%patch102 -p1
+#%patch102 -p1
 %patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLSITELIB=/usr/lib/perl5/site_perl
@@ -234,8 +242,6 @@ find $RPM_BUILD_ROOT/usr -type f -path '
 %config(noreplace) /etc/qpsmtpd/*
 %config(noreplace) /etc/xinetd.d/smtp
 %config(noreplace) /etc/sysconfig/qpsmtpd-forkserver
-%attr(0700,smtpd,smtpd) %dir /var/spool/qpsmtpd
-%attr(0750,smtpd,smtpd) %dir /var/log/qpsmtpd
 
 %files apache -f qpsmtpd-apache-%{version}-filelist
 %defattr(-,root,root)
@@ -251,28 +257,28 @@ find $RPM_BUILD_ROOT/usr -type f -path '
 /usr/share/qpsmtpd/plugins/async/dnsbl
 /usr/share/qpsmtpd/plugins/async/require_resolvable_fromhost
 
+%changelog
+* Tue Oct 16 2007 Charlie Brady <charlie_brady@mitel.com> 0.40-1.7.sme
+- Add support for disconnect option in rhsbl plugin [SME: 3390]
 
+* Sat Jun 30 2007 Shad L. Lords <slords@mail.com> 0.40-1.6.sme
+- Move clamav headers to top to not mess up message signing.
 
+* Thu Jun 28 2007 Gavin Weight <gweight@gmail.com> 0.40-1.5.sme
+- Remove the scriptlets within the .spec file. [SME: 3112]
 
+* Mon Jun 25 2007 Shad L. Lords <slords@mail.com> 0.40-1.4.sme
+- Deny soft if clamscan fails [SME: 3098]
 
+* Fri Jun 15 2007 Shad L. Lords <slords@mail.com> 0.40-1.3.sme
+- Fix clamd.conf path for clamav plugin [SME: 3067]
 
-%pre
-if ! id smtpd >/dev/null 2>&1
-then
-    # need to create smtpd user.
-    if perl -e 'exit ! defined(getgrnam("postdrop"))'
-    then
-	# if postfix is installed, we will probably use
-	# queue/postfix, which will need this:
-    	supp="-G postdrop"
-    fi
-    useradd -r -m $supp smtpd
-fi
+* Thu Jun 14 2007 Shad L. Lords <slords@mail.com> 0.40-1.2.sme
+- Fix clamav patch so service starts [SME: 3065]
 
-%post
-/sbin/chkconfig --add qpsmtpd-forkserver
+* Thu Jun 14 2007 Shad L. Lords <slords@mail.com> 0.40-1.1.sme
+- Update for smeserver [SME: 3065]
 
-%changelog
 * Tue Jun 12 2007 <hjp@hjp.at> 0.40-1.0
 - updated to 0.40 - no code change.