[smbldap-tools] Nobody else likes macros for commands

[Paul Howarth]

commit 835866674caee8779732c1989b819c4e065b1fd5
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Jan 8 19:12:10 2012 +0000

    Nobody else likes macros for commands

 smbldap-tools.spec |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/smbldap-tools.spec b/smbldap-tools.spec
index 0dc68db..3c7491e 100644
--- a/smbldap-tools.spec
+++ b/smbldap-tools.spec
@@ -1,15 +1,15 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://gna.org/projects/smbldap-tools/
 Source0:	http://download.gna.org/smbldap-tools/packages/smbldap-tools-%{version}.tar.gz
 # Need perl(IO::Socket::SSL) for LDAP over SSL (#122066, #207430)
 Requires:	perl(IO::Socket::SSL)
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	openssl
 
@@ -35,46 +35,45 @@ groups and passwords.
 %prep
 %setup -q
 %patch0 -p1
-%{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g;
-		  s|/opt/IDEALX||g;' \
+perl -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g; s|/opt/IDEALX||g;' \
 	smbldap_tools.pm configure.pl
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 
 # Don't want these in %%{_sbindir}...
-%{__mv} smbldap-tools.spec original-smbldap-tools.spec
+mv smbldap-tools.spec original-smbldap-tools.spec
 
 # Generate manpages
-%{__mkdir} manpages
+mkdir manpages
 for i in smbldap-*; do
-	/usr/bin/pod2man --section=8 ${i} > manpages/${i}.8
+	pod2man --section=8 ${i} > manpages/${i}.8
 done
 
 # Figure out where ssl stuff goes
 %define use_pki %(if [ -f /etc/pki/tls/certs/ca-bundle.crt ]; then echo 1; else echo 0; fi)
 %if ! %{use_pki}
-%{__perl} -pi -e 's|/etc/pki/tls/certs/|%{_datadir}/ssl/certs/|g;' smbldap.conf
+perl -pi -e 's|/etc/pki/tls/certs/|%{_datadir}/ssl/certs/|g;' smbldap.conf
 %endif
 
 # Not allowed to have executable docs any more
-%{__chmod} -R -c -x+X configure.pl doc/
+chmod -R -c -x+X configure.pl doc/
 
 %build
 
 %install
-%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_sbindir}/
-%{__install} -d -m0755 %{buildroot}%{_mandir}/man8/
-%{__install} -d -m0755 %{buildroot}%{perl_vendorlib}/
-%{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir}/
-%{__install} -p -m0644 manpages/* %{buildroot}%{_mandir}/man8/
-%{__install} -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}/
-%{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
-%{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
+rm -rf %{buildroot}
+install -d -m0755 %{buildroot}%{_sbindir}/
+install -d -m0755 %{buildroot}%{_mandir}/man8/
+install -d -m0755 %{buildroot}%{perl_vendorlib}/
+install -p -m0755 smbldap-* %{buildroot}%{_sbindir}/
+install -p -m0644 manpages/* %{buildroot}%{_mandir}/man8/
+install -p -m0644 smbldap_tools.pm %{buildroot}%{perl_vendorlib}/
+install -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf
+install -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -112,6 +111,9 @@ done
 %{_mandir}/man8/smbldap-usershow.8*
 
 %changelog
+* Sun Jan  8 2012 Paul Howarth <paul at city-fan.org> - 0.9.6-6
+- Nobody else likes macros for commands
+
 * Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.9.6-5
 - Perl mass rebuild