[spamass-milter] Drop the wrapper, which hasn't been needed since 0.3.1 was released

[Paul Howarth]

commit f2b1981ffc584627666158503bb2bfaa0a23cc74
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Jul 18 13:20:59 2011 +0100

    Drop the wrapper, which hasn't been needed since 0.3.1 was released

 spamass-milter-wrapper |   32 --------------------------------
 spamass-milter.spec    |    6 ++----
 spamass-milter.sysv    |    2 +-
 3 files changed, 3 insertions(+), 37 deletions(-)
---
diff --git a/spamass-milter.spec b/spamass-milter.spec
index 8bc3ed0..37c55af 100644
--- a/spamass-milter.spec
+++ b/spamass-milter.spec
@@ -6,7 +6,6 @@ License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
 Source0:	http://savannah.nongnu.org/download/spamass-milt/spamass-milter-%{version}.tar.bz2
-Source1:	spamass-milter-wrapper
 Source2:	spamass-milter.sysv
 Source3:	spamass-milter.sysconfig
 Source4:	spamass-milter.README.Postfix
@@ -79,7 +78,7 @@ socket to communicate with the Postfix MTA.
 # Local patch for initscript and socket paths
 %patch10 -p1 -b .pathnames
 
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
+cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 sed -i -e	's|%%{_localstatedir}|%{_localstatedir}|g;
 		 s|%%{_initrddir}|%{_initrddir}|g;
 		 s|%%{_sysconfdir}|%{_sysconfdir}|g;
@@ -101,7 +100,6 @@ install -m 644 -D spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/
 install -m 755 -d %{buildroot}%{_localstatedir}/lib/spamass-milter
 install -m 711 -d %{buildroot}%{_localstatedir}/run/spamass-milter
 install -m 750 -d %{buildroot}%{_localstatedir}/run/spamass-milter/postfix
-install -m 755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper
 
 # Make sure /var/run/spamass-milter{,/postfix} exist at boot time for systems
 # with /var/run on tmpfs (#656692)
@@ -151,7 +149,6 @@ fi
 %endif
 %{_initrddir}/spamass-milter
 %{_sbindir}/spamass-milter
-%{_sbindir}/spamass-milter-wrapper
 %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/lib/spamass-milter/
 %dir %attr(-,sa-milt,sa-milt) %{_localstatedir}/run/spamass-milter/
 
@@ -165,6 +162,7 @@ fi
 
 %changelog
 * Mon Jul 18 2011 Paul Howarth <paul at city-fan.org> 0.3.2-2
+- Drop the wrapper, which hasn't been needed since 0.3.1 was released
 - Nobody else likes macros for commands
 
 * Tue Feb 15 2011 Paul Howarth <paul at city-fan.org> 0.3.2-1
diff --git a/spamass-milter.sysv b/spamass-milter.sysv
index 1c0ade4..a42cce2 100644
--- a/spamass-milter.sysv
+++ b/spamass-milter.sysv
@@ -59,7 +59,7 @@ start() {
 	touch ${pidfile}
 	chown ${RUN_AS_USER} ${pidfile}
 	[ -x /sbin/restorecon ] && /sbin/restorecon ${pidfile}
-	daemon --user ${RUN_AS_USER} %{_sbindir}/${prog}-wrapper ${SOCKET_OPTIONS} -p ${SOCKET} -P ${pidfile} ${EXTRA_FLAGS}
+	daemon --user ${RUN_AS_USER} %{_sbindir}/${prog} ${SOCKET_OPTIONS} -p ${SOCKET} -P ${pidfile} -f ${EXTRA_FLAGS}
 	RETVAL=$?
 	echo
 	if [ ${RETVAL} -eq 0 ]; then