[spamass-milter] Nobody else likes macros for commands

[Paul Howarth]

commit ba6bd57309acee2fd2c719ef8a697a84f0a3af1f
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Jul 18 13:10:03 2011 +0100

    Nobody else likes macros for commands

 spamass-milter.spec |   49 ++++++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/spamass-milter.spec b/spamass-milter.spec
index fc22e0f..8bc3ed0 100644
--- a/spamass-milter.spec
+++ b/spamass-milter.spec
@@ -1,7 +1,7 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
@@ -23,7 +23,7 @@ Patch5:		spamass-milter-0.3.1-group.patch
 Patch7:		spamass-milter-0.3.1-ipv6.patch
 # Fedora-specific patches
 Patch10:	spamass-milter-0.3.1-pathnames.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	spamassassin, sendmail-devel
 Requires:	spamassassin, /usr/sbin/sendmail
 %if 0%{?fedora} > 14
@@ -79,38 +79,41 @@ socket to communicate with the Postfix MTA.
 # Local patch for initscript and socket paths
 %patch10 -p1 -b .pathnames
 
-%{__cp} -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
-%{__sed} -i -e 's|%%{_localstatedir}|%{_localstatedir}|g;
-		s|%%{_initrddir}|%{_initrddir}|g;
-		s|%%{_sysconfdir}|%{_sysconfdir}|g;
-		s|%%{_sbindir}|%{_sbindir}|g;' \
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
+sed -i -e	's|%%{_localstatedir}|%{_localstatedir}|g;
+		 s|%%{_initrddir}|%{_initrddir}|g;
+		 s|%%{_sysconfdir}|%{_sysconfdir}|g;
+		 s|%%{_sbindir}|%{_sbindir}|g;' \
 	spamass-milter.{README.Postfix,sysv,sysconfig} README
-%{__mv} spamass-milter.README.Postfix README.Postfix
+mv spamass-milter.README.Postfix README.Postfix
 
 %build
 export SENDMAIL=/usr/sbin/sendmail
 %configure
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
-%{__install} -m 755 -D spamass-milter.sysv %{buildroot}%{_initrddir}/spamass-milter
-%{__install} -m 644 -D spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamass-milter
-%{__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
+install -m 755 -D spamass-milter.sysv %{buildroot}%{_initrddir}/spamass-milter
+install -m 644 -D spamass-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/spamass-milter
+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)
 %if 0%{?fedora} > 14
-%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
-%{__install} -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/spamass-milter.conf
-%{__install} -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/spamass-milter-postfix.conf
+install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/spamass-milter.conf
+install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/spamass-milter-postfix.conf
 %endif
 
+%clean
+rm -rf %{buildroot}
+
 %pre
 /usr/bin/getent group sa-milt >/dev/null || /usr/sbin/groupadd -r sa-milt
 /usr/bin/getent passwd sa-milt >/dev/null || \
@@ -138,9 +141,6 @@ fi
 # that.
 /usr/sbin/usermod -a -G postfix sa-milt || :
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS README
@@ -164,6 +164,9 @@ fi
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
+* Mon Jul 18 2011 Paul Howarth <paul at city-fan.org> 0.3.2-2
+- Nobody else likes macros for commands
+
 * Tue Feb 15 2011 Paul Howarth <paul at city-fan.org> 0.3.2-1
 - Update to 0.3.2 (upstream fix for popen unsanitized input vulnerability:
   CVE-2010-1132, #572117, #572119, http://savannah.nongnu.org/bugs/?29136)