[perl-Net-SSLeay] Nobody else likes macros for commands

[Paul Howarth]

commit e042be344b992402653e94e03356cd3530caef20
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Jul 14 09:02:00 2011 +0100

    Nobody else likes macros for commands

 perl-Net-SSLeay.spec |   47 +++++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 22 deletions(-)
---
diff --git a/perl-Net-SSLeay.spec b/perl-Net-SSLeay.spec
index e8ff2fc..9504c02 100644
--- a/perl-Net-SSLeay.spec
+++ b/perl-Net-SSLeay.spec
@@ -1,13 +1,13 @@
 Name:		perl-Net-SSLeay
 Version:	1.36
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Perl extension for using OpenSSL
 Group:		Development/Libraries
 License:	OpenSSL
 URL:		http://search.cpan.org/dist/Net-SSLeay/
 Source0:	http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-%{version}.tar.gz
-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)
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 BuildRequires:	perl(ExtUtils::MakeMaker), openssl-devel
 BuildRequires:	perl(MIME::Base64)
 BuildRequires:	perl(Test::Exception), perl(Test::NoWarnings), perl(Test::Pod)
@@ -15,8 +15,8 @@ BuildRequires:	perl(Test::Warn)
 
 # don't "provide" private Perl libs or the redundant unversioned perl(Net::SSLeay) one
 %global _use_internal_dependency_generator 0
-%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u
-%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P} | %{__grep} -Fvx 'perl(Net::SSLeay)'"
+%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | sort -u
+%global __find_provides /bin/sh -c "grep -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P} | grep -Fvx 'perl(Net::SSLeay)'"
 %global __find_requires /bin/sh -c "%{__deploop R}"
 
 %description
@@ -29,35 +29,35 @@ so you can write servers or clients for more complicated applications.
 %prep
 %setup -q -n Net-SSLeay-%{version}
 
-%{__chmod} -c 644 examples/*
-%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl
+chmod -c 644 examples/*
+perl -pi -e 's|/usr/local/bin/perl|/usr/bin/perl|' examples/*.pl
 for f in Credits lib/Net/SSLeay.pm; do
-	/usr/bin/iconv -f iso-8859-1 -t utf-8 ${f} > ${f}.utf8
-	%{__mv} ${f}.utf8 ${f}
+	iconv -f iso-8859-1 -t utf-8 ${f} > ${f}.utf8
+	mv ${f}.utf8 ${f}
 done
 
 %build
-PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \
+PERL_MM_USE_DEFAULT=1 perl Makefile.PL \
 	INSTALLDIRS=vendor \
-	INC="$(/usr/bin/pkg-config --cflags-only-I openssl)" \
-	LIBS="$(/usr/bin/pkg-config --libs openssl)" \
+	INC="$(pkg-config --cflags-only-I openssl)" \
+	LIBS="$(pkg-config --libs openssl)" \
 	OPTIMIZE="%{optflags}"
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
-/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -type f -name '*.bs' -empty -exec %{__rm} -f {} ';'
-/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
-%{__rm} -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl
-%{__chmod} -R u+w %{buildroot}
+rm -rf %{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+rm -f %{buildroot}%{perl_vendorarch}/Net/ptrtstrun.pl
+chmod -R u+w %{buildroot}
 
 %check
-%{__make} test TEST_VERBOSE=1
+make test TEST_VERBOSE=1
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -67,6 +67,9 @@ PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL \
 %{_mandir}/man3/Net::SSLeay*.3*
 
 %changelog
+* Thu Jul 14 2011 Paul Howarth <paul at city-fan.org> - 1.36-6
+- nobody else likes macros for commands
+
 * Wed Jul 13 2011 Iain Arnell <iarnell at gmail.com> - 1.36-5
 - drop obsolete BRs Array::Compare, Sub::Uplevel, Tree::DAG_Node