[perl-Sub-Install/el5] Update to 0.925 (packaging changes)

[Paul Howarth]

commit 18019c8e5a0ca91255106d52046250bf0be2d84f
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Feb 8 13:50:16 2012 +0000

    Update to 0.925 (packaging changes)
    
    - Update to 0.925 (packaging changes)
    - Fix License
    - BR: perl(ExtUtils::MakeMaker)
    - BR: perl(Test::Output) for extra test coverage
    - BR: perl(Carp), perl(Scalar::Util), perl(strict) and perl(warnings) for
      completeness
    - Skip buildreqs perl(Test::Output) and perl(Test::Perl::Critic) when
      bootstrapping to avoid circular build dependencies
    - Use DESTDIR rather than PERL_INSTALL_ROOT
    - Make %files list more explicit
    - Don't use macros for commands

 .gitignore            |    2 +-
 perl-Sub-Install.spec |   57 +++++++++++++++++++++++++++++++-----------------
 sources               |    2 +-
 3 files changed, 39 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17b7368..8486097 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Sub-Install-0.922.tar.gz
+/Sub-Install-[0-9.]*.tar.gz
diff --git a/perl-Sub-Install.spec b/perl-Sub-Install.spec
index 2ec5c3e..c289640 100644
--- a/perl-Sub-Install.spec
+++ b/perl-Sub-Install.spec
@@ -1,18 +1,28 @@
 Name:           perl-Sub-Install
-Version:        0.924
+Version:        0.925
 Release:        1%{?dist}
 Summary:        Install subroutines into packages easily
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Sub-Install/
 Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Sub-Install-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-# testing
-BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Scalar::Util)
+BuildRequires:  perl(strict)
+# Test::Output -> Sub::Exporter -> Sub::Install
+# Test::Perl::Critic -> Perl::Critic -> Exception::Class -> Test::EOL ->
+#   Pod::Coverage::TrustPod -> Pod::Eventual -> Mixin::Linewise -> Sub::Exporter -> Sub::Install
+%if 0%{!?perl_bootstrap:1}
+BuildRequires:  perl(Test::Output)
 BuildRequires:  perl(Test::Perl::Critic)
+%endif
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
+BuildRequires:  perl(warnings)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 This module makes it easy to install subroutines into packages without the
@@ -23,24 +33,18 @@ can see them.
 %setup -q -n Sub-Install-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
-
+make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} %{buildroot}/*
+find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
+%{_fixperms} %{buildroot}
 
 %check
-# you'll note a number of tests are skipped due to Test::Output not being
-# present.  However, Test::Output requires Sub::Exporter which requires...
-# Sub::Install.  Holy circular loop, Batman!  :)
-make test
+make test %{!?perl_bootstrap:PERL_TEST_CRITIC=1}
 
 %clean
 rm -rf %{buildroot}
@@ -48,10 +52,23 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Sub/
+%{_mandir}/man3/Sub::Install.3pm*
 
 %changelog
+* Wed Feb  8 2012 Paul Howarth <paul at city-fan.org> 0.925-1
+- update to 0.925 (packaging changes)
+- fix License
+- BR: perl(ExtUtils::MakeMaker)
+- BR: perl(Test::Output) for extra test coverage
+- BR: perl(Carp), perl(Scalar::Util), perl(strict) and perl(warnings) for
+  completeness
+- Skip buildreqs perl(Test::Output) and perl(Test::Perl::Critic) when
+  bootstrapping to avoid circular build dependencies
+- use DESTDIR rather than PERL_INSTALL_ROOT
+- make %%files list more explicit
+- don't use macros for commands
+
 * Wed Nov 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.924-1
 - update to 0.924
 - add perl(Test::Perl::Critic) to BR's
diff --git a/sources b/sources
index b41530a..94fcdb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eae66cb5cbd2064ae02b3aeacf6338e4  Sub-Install-0.924.tar.gz
+694aaec771c42280746a9a6279683263  Sub-Install-0.925.tar.gz