[perlbrew/el5: 5/5] restore older-Test-More patch for EPEL

[Iain Arnell]

commit 04bb1a2e6087f314a1c85d4e78e135725b874679
Author: Iain Arnell <iarnell at gmail.com>
Date:   Fri May 27 09:41:09 2011 +0200

    restore older-Test-More patch for EPEL
    
    and skip t/installation.t

 older-Test-More.patch |   40 +++++++++++++++++++++++++++++-----------
 perlbrew.spec         |    6 ++++++
 2 files changed, 35 insertions(+), 11 deletions(-)
---
diff --git a/older-Test-More.patch b/older-Test-More.patch
index fcd898e..011ad0b 100644
--- a/older-Test-More.patch
+++ b/older-Test-More.patch
@@ -1,18 +1,36 @@
-diff -up App-perlbrew-0.15/t/02.format_perl_version.t.orig App-perlbrew-0.15/t/02.format_perl_version.t
---- App-perlbrew-0.15/t/02.format_perl_version.t.orig	2010-11-17 11:11:40.000000000 +0100
-+++ App-perlbrew-0.15/t/02.format_perl_version.t	2010-12-09 05:15:35.000000000 +0100
+diff -up App-perlbrew-0.22/t/06.installed_perls.t.orig App-perlbrew-0.22/t/06.installed_perls.t
+--- App-perlbrew-0.22/t/06.installed_perls.t.orig	2011-05-17 04:54:11.000000000 +0200
++++ App-perlbrew-0.22/t/06.installed_perls.t	2011-05-27 09:44:35.000000000 +0200
 @@ -2,7 +2,7 @@
  use strict;
  use warnings;
- use English qw( -no_match_vars );
--use Test::More;
-+use Test::More tests => 3;
  use lib qw(lib);
+-use Test::More;
++use Test::More 'no_plan';
+ use App::perlbrew;
  
+ my $app = App::perlbrew->new();
+@@ -19,5 +19,3 @@ for my $perl (@perls) {
+     ok defined $perl->{version},    "Version: $perl->{version}";
+     ok defined $perl->{is_current}, "Current?: " . ($perl->{is_current} ? "true" : "false");
+ }
+-
+-done_testing;
+diff -up App-perlbrew-0.22/t/07.argv.t.orig App-perlbrew-0.22/t/07.argv.t
+--- App-perlbrew-0.22/t/07.argv.t.orig	2011-05-26 19:14:39.000000000 +0200
++++ App-perlbrew-0.22/t/07.argv.t	2011-05-27 09:44:57.000000000 +0200
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 5;
  use App::perlbrew;
-@@ -29,5 +29,4 @@ my @test_cases = (
-         is( $app->format_perl_version( $test->{raw} ),
-             $test->{parsed}, "$test->{raw} -> $test->{parsed}" );
-     }
--    done_testing();
+ 
+ {
+@@ -20,5 +20,3 @@ use App::perlbrew;
+     is $app->{D}[0], 'cc=ccache gcc';
+     is $app->{D}[1], 'ld=gcc';
  }
+-
+-done_testing;
diff --git a/perlbrew.spec b/perlbrew.spec
index 28736fb..89afb0a 100644
--- a/perlbrew.spec
+++ b/perlbrew.spec
@@ -6,6 +6,8 @@ License:        MIT
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/App-perlbrew/
 Source0:        http://www.cpan.org/authors/id/G/GU/GUGOD/App-perlbrew-%{version}.tar.gz
+# allow tests to run on older Test::More for EPEL
+Patch0:         older-Test-More.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.8.0
@@ -36,6 +38,7 @@ almost like an isolated perl environments.
 
 %prep
 %setup -q -n App-perlbrew-%{version}
+%patch0 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -52,12 +55,15 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
+# no support for subtests in EPEL Test-Simple
+rm t/installation.t
 make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/*
 %{_bindir}/%{name}