[perl-UNIVERSAL-require] Clean up and fix FTBFS (#914324)

[Paul Howarth]

commit 544110e12f21542f49252134d325db4236c74870
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Feb 25 09:55:25 2013 +0000

    Clean up and fix FTBFS (#914324)
    
    - BR: perl(lib) and perl(ExtUtils::MakeMaker) to fix FTBFS (#914324)
    - Drop %defattr, redundant since rpm 4.4
    - Don't need to remove empty directories from the buildroot
    - Use %{_fixperms} macro rather than our own chmod incantation
    - Use DESTDIR rather than PERL_INSTALL_ROOT
    - Don't use macros for commands

 perl-UNIVERSAL-require.spec |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/perl-UNIVERSAL-require.spec b/perl-UNIVERSAL-require.spec
index ac5b5e3..80a9b75 100644
--- a/perl-UNIVERSAL-require.spec
+++ b/perl-UNIVERSAL-require.spec
@@ -1,15 +1,17 @@
 Name:           perl-UNIVERSAL-require
 Version:        0.13
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Require() modules from a variable
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-require/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-require-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(lib)
 BuildRequires:  perl(Test::More)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 # Filter bogus provide for perl(UNIVERSAL) (rpm 4.9 onwards)
 %global __provides_exclude ^perl\\(UNIVERSAL\\)
@@ -25,15 +27,14 @@ Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi
 %define __perl_provides %{provfilt}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
 
 %check
 make test
@@ -42,13 +43,19 @@ make test
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc Changes
 %{perl_vendorlib}/UNIVERSAL/
 %{_mandir}/man3/UNIVERSAL::require.3pm*
 
-
 %changelog
+* Mon Feb 25 2013 Paul Howarth <paul at city-fan.org> - 0.13-12
+- BR: perl(lib) and perl(ExtUtils::MakeMaker) to fix FTBFS (#914324)
+- Drop %%defattr, redundant since rpm 4.4
+- Don't need to remove empty directories from the buildroot
+- Use %%{_fixperms} macro rather than our own chmod incantation
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+- Don't use macros for commands
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild