[rbldnsd] Nobody else likes macros for commands

[Paul Howarth]

commit e2b95d8ed13abc6701c9cb0612cf1085dc1f0fdf
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Jan 5 22:18:45 2012 +0000

    Nobody else likes macros for commands

 rbldnsd.spec |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/rbldnsd.spec b/rbldnsd.spec
index 14b0f44..75958d3 100644
--- a/rbldnsd.spec
+++ b/rbldnsd.spec
@@ -1,13 +1,13 @@
 Summary:	Small, fast daemon to serve DNSBLs
 Name:		rbldnsd
 Version:	0.996b
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://www.corpit.ru/mjt/rbldnsd.html
 Source0:	http://www.corpit.ru/mjt/rbldnsd/rbldnsd_%{version}.tar.gz
 Source1:	rbldnsd.init
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	gawk, zlib-devel
 
 Requires(pre):	shadow-utils
@@ -21,25 +21,25 @@ blocklists.
 
 %prep
 %setup -q -n %{name}-%{version}
-%{__sed} -i	-e 's@/var/lib/rbldns\([/ ]\)@%{_localstatedir}/lib/rbldnsd\1 at g' \
-		-e 's@\(-r/[a-z/]*\) -b@\1 -q -b at g' debian/rbldnsd.default
+sed -i	-e 's@/var/lib/rbldns\([/ ]\)@%{_localstatedir}/lib/rbldnsd\1 at g' \
+	-e 's@\(-r/[a-z/]*\) -b@\1 -q -b at g' debian/rbldnsd.default
 
 %build
 # this is not an autotools-generated configure script, and does not support --libdir
 CFLAGS="%{optflags}" ./configure
-%{__make}
+make
 
 %install
-%{__rm} -rf %{buildroot}
-%{__mkdir_p} %{buildroot}{%{_sbindir},%{_mandir}/man8,%{_initrddir},%{_sysconfdir}/sysconfig}
-%{__mkdir_p} %{buildroot}%{_localstatedir}/lib/rbldnsd
-%{__install} -m 755 rbldnsd			%{buildroot}%{_sbindir}
-%{__install} -m 644 rbldnsd.8			%{buildroot}%{_mandir}/man8
-%{__install} -m 644 debian/rbldnsd.default	%{buildroot}%{_sysconfdir}/sysconfig/rbldnsd
-%{__install} -m 755 %{SOURCE1}			%{buildroot}%{_initrddir}/rbldnsd
+rm -rf %{buildroot}
+mkdir -p %{buildroot}{%{_sbindir},%{_mandir}/man8,%{_initrddir},%{_sysconfdir}/sysconfig}
+mkdir -p %{buildroot}%{_localstatedir}/lib/rbldnsd
+install -m 755 rbldnsd			%{buildroot}%{_sbindir}
+install -m 644 rbldnsd.8		%{buildroot}%{_mandir}/man8
+install -m 644 debian/rbldnsd.default	%{buildroot}%{_sysconfdir}/sysconfig/rbldnsd
+install -m 755 %{SOURCE1}		%{buildroot}%{_initrddir}/rbldnsd
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %pre
 /usr/bin/getent group rbldns >/dev/null || /usr/sbin/groupadd -r rbldns
@@ -70,14 +70,17 @@ fi
 %{_initrddir}/rbldnsd
 
 %changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.996b-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Jan  5 2012 Paul Howarth <paul at city-fan.org> 0.996b-5
+- nobody else likes macros for commands
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.996b-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Feb  9 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.996b-4
+- rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.996b-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.996b-3
+- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 0.996b-2
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Mon Mar 31 2008 Paul Howarth <paul at city-fan.org> 0.996b-1
 - update to 0.996b