[perl-Test-HasVersion/el5] Changes for EPEL-4/5 compatibility

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



commit 2674b2eb79bd2f4c9fa3d925471063d39ad9d084
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date:   Wed Aug 10 11:06:07 2011 +0100

    Changes for EPEL-4/5 compatibility
    
    Changes for EPEL-4/5 compatibility:
    - Add BuildRoot
    - Add %clean and clean buildroot at start of %install
    - Drop perl(Test::Builder::Tester) version requirement to 1.01
    Remove unnecessary runtime dependency on perl(Test::Builder::Tester)

 Test-HasVersion-0.012-T::B::T-version.patch |   11 +++++++++++
 perl-Test-HasVersion.spec                   |   26 ++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/Test-HasVersion-0.012-T::B::T-version.patch b/Test-HasVersion-0.012-T::B::T-version.patch
new file mode 100644
index 0000000..e1200d8
--- /dev/null
+++ b/Test-HasVersion-0.012-T::B::T-version.patch
@@ -0,0 +1,11 @@
+--- Test-HasVersion-0.012/t/02_basic.t.orig	2006-09-29 12:50:54.000000000 +0100
++++ Test-HasVersion-0.012/t/02_basic.t	2011-08-09 18:06:15.006867177 +0100
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ 
+-use Test::Builder::Tester 1.04 tests => 6;
++use Test::Builder::Tester tests => 6;
+ 
+ use Test::More;
+ 
diff --git a/perl-Test-HasVersion.spec b/perl-Test-HasVersion.spec
index 9ff575f..505795a 100644
--- a/perl-Test-HasVersion.spec
+++ b/perl-Test-HasVersion.spec
@@ -1,22 +1,23 @@
 Name:           perl-Test-HasVersion
 Version:        0.012
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Check Perl modules have version numbers
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Test-HasVersion/
 Source0:        http://www.cpan.org/authors/id/F/FE/FERREIRA/Test-HasVersion-%{version}.tar.gz
+Patch0:         Test-HasVersion-0.012-T::B::T-version.patch
 BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::Find)
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(Test::Builder)
-BuildRequires:  perl(Test::Builder::Tester) >= 1.04
+BuildRequires:  perl(Test::Builder::Tester) >= 1.01
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(Test::Pod::Coverage)
-Requires:       perl(Test::Builder::Tester) >= 1.04
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %{?perl_default_filter}
@@ -30,21 +31,27 @@ for. Use it!
 %prep
 %setup -q -n Test-HasVersion-%{version}
 
+# t/02_basic.t wants Test::Builder::Tester 1.04 but it works fine with
+# Test::Builder::Tester 1.01 in EPEL-4 and Test::Builder::Tester 1.02 in RHEL-5
+%patch0 -p1
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
+rm -rf $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 -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
 
 %check
 make test
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
 %defattr(-,root,root,-)
 %doc Changes README
@@ -53,6 +60,13 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Wed Aug 10 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 0.012-3
+- Changes for EPEL-4/5 compatibility:
+  - Add BuildRoot
+  - Add %%clean and clean buildroot at start of %%install
+  - Drop perl(Test::Builder::Tester) version requirement to 1.01
+- Remove unnecessary runtime dependency on perl(Test::Builder::Tester)
+
 * Mon Jun 20 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 0.012-2
 - Perl mass rebuild
 
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel



[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Legacy Announce]     [Fedora PHP Devel]     [Kernel Devel]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Big List of Linux Books]     [Gimp]     [Yosemite Information]
  Powered by Linux