[mod_fcgid] Nobody else likes macros for commands

[Paul Howarth]

commit 19557d9f7d40a9b9c00422cf64d83853576cd0af
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Jan 6 14:07:57 2012 +0000

    Nobody else likes macros for commands

 mod_fcgid.spec |   49 ++++++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/mod_fcgid.spec b/mod_fcgid.spec
index 3376e4f..42fef50 100644
--- a/mod_fcgid.spec
+++ b/mod_fcgid.spec
@@ -16,7 +16,7 @@
 
 Name:		mod_fcgid
 Version:	2.3.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	FastCGI interface module for Apache 2
 Group:		System Environment/Daemons
 License:	ASL 2.0
@@ -86,61 +86,61 @@ SELinux policy module supporting FastCGI applications with mod_fcgid.
 
 %prep
 %setup -q
-%{__cp} -p %{SOURCE1} fcgid.conf
-%{__cp} -p %{SOURCE2} README.RPM
-%{__cp} -p %{SOURCE3} README.SELinux
+cp -p %{SOURCE1} fcgid.conf
+cp -p %{SOURCE2} README.RPM
+cp -p %{SOURCE3} README.SELinux
 %if 0%{?selinux_policynum} < 20501
-%{__cp} -p %{SOURCE10} fastcgi.te
+cp -p %{SOURCE10} fastcgi.te
 %else
-%{__cp} -p %{SOURCE11} fastcgi.te
+cp -p %{SOURCE11} fastcgi.te
 %endif
-%{__cp} -p %{SOURCE12} fastcgi.fc
+cp -p %{SOURCE12} fastcgi.fc
 
 # Fix shellbang in fixconf script for our location of sed
 %patch0 -p1
 
 %build
 APXS=/usr/sbin/apxs ./configure.apxs
-%{__make}
+make
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
-	%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
-	%{__mv} fastcgi.pp fastcgi.pp.${selinuxvariant}
-	%{__make} NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
+	make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
+	mv fastcgi.pp fastcgi.pp.${selinuxvariant}
+	make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
 done
 %endif
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} MKINSTALLDIRS="%{__mkdir_p}" install
-%{__install} -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
-%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} MKINSTALLDIRS="mkdir -p" install
+install -D -m 644 fcgid.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fcgid.conf
+install -d -m 755 %{buildroot}%{_localstatedir}/run/mod_fcgid
 
 # Include the manual as %%doc, don't need it elsewhere
-%{__rm} -rf %{buildroot}%{_var}/www/manual
+rm -rf %{buildroot}%{_var}/www/manual
 
 # Make sure /var/run/mod_fcgid exists at boot time for systems
 # with /var/run on tmpfs (#656625)
 %if 0%{?fedora} > 14
-%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
-%{__install} -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/tmpfiles.d/mod_fcgid.conf
+install -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/tmpfiles.d/mod_fcgid.conf
 %endif
 
 # Install SELinux policy modules
 %if %{selinux_module}
 for selinuxvariant in %{selinux_variants}
 do
-	%{__install} -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
-	%{__install} -p -m 644 fastcgi.pp.${selinuxvariant} \
+	install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
+	install -p -m 644 fastcgi.pp.${selinuxvariant} \
 		%{buildroot}%{_datadir}/selinux/${selinuxvariant}/fastcgi.pp
 done
 # Hardlink identical policy module packages together
-/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
+hardlink -cv %{buildroot}%{_datadir}/selinux
 %endif
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %if %{selinux_module}
 %post selinux
@@ -188,7 +188,10 @@ exit 0
 %endif
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.6-3
+* Fri Jan  6 2012 Paul Howarth <paul at city-fan.org> 2.3.6-4
+- Nobody else likes macros for commands
+
+* Tue Feb  8 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Dec  1 2010 Paul Howarth <paul at city-fan.org> 2.3.6-2