rpms/perl/F-12 perl-update-Module-Pluggable.patch, NONE, 1.1 perl-update-Test-Simple.patch, 1.1, 1.2 perl.spec, 1.231, 1.232
Štěpán Kasal
kasal at fedoraproject.org
Thu Sep 3 16:18:28 UTC 2009
- Previous message (by thread): rpms/python-markdown2/EL-5 markdown2-old-pygments.patch, NONE, 1.1 import.log, 1.5, 1.6 python-markdown2.spec, 1.8, 1.9
- Next message (by thread): rpms/fsarchiver/devel .cvsignore, 1.10, 1.11 fsarchiver.spec, 1.17, 1.18 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kasal
Update of /cvs/extras/rpms/perl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4589
Modified Files:
perl-update-Test-Simple.patch perl.spec
Added Files:
perl-update-Module-Pluggable.patch
Log Message:
* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
- update Module-Pluggable to 3.9
perl-update-Module-Pluggable.patch:
MANIFEST | 11 +
lib/Devel/InnerPackage.pm | 4
lib/Module/Pluggable.pm | 15 +-
lib/Module/Pluggable/Object.pm | 134 +++++++++++++-------
t/Module_Pluggable/02alsoworks.t | 2
t/Module_Pluggable/02works.t | 2
t/Module_Pluggable/03diffname.t | 2
t/Module_Pluggable/04acmedir.t | 2
t/Module_Pluggable/04acmedir_single.t | 2
t/Module_Pluggable/04acmepath.t | 2
t/Module_Pluggable/04acmepath_single.t | 2
t/Module_Pluggable/05postpath.t | 2
t/Module_Pluggable/06multipath.t | 2
t/Module_Pluggable/07instantiate.t | 4
t/Module_Pluggable/08nothing.t | 2
t/Module_Pluggable/09require.t | 2
t/Module_Pluggable/10innerpack.t | 2
t/Module_Pluggable/10innerpack_inner.t | 2
t/Module_Pluggable/10innerpack_noinner.t | 2
t/Module_Pluggable/10innerpack_onefile.t | 27 ++++
t/Module_Pluggable/10innerpack_override.t | 2
t/Module_Pluggable/10innerpack_super.t | 29 ++++
t/Module_Pluggable/11usetwice.t | 2
t/Module_Pluggable/12only.t | 2
t/Module_Pluggable/12onlyarray.t | 2
t/Module_Pluggable/12onlyregex.t | 2
t/Module_Pluggable/12onlyrequire.t | 21 +++
t/Module_Pluggable/13except.t | 2
t/Module_Pluggable/13exceptarray.t | 4
t/Module_Pluggable/13exceptregex.t | 4
t/Module_Pluggable/14package.t | 2
t/Module_Pluggable/15topicsafe.t | 2
t/Module_Pluggable/16different_extension.t | 2
t/Module_Pluggable/17devel_inner_package.t | 2
t/Module_Pluggable/18skipped_package.t | 2
t/Module_Pluggable/19can_ok_clobber.t | 2
t/Module_Pluggable/20dodgy_files.t | 16 +-
t/Module_Pluggable/21editor_junk.t | 53 +++++++
t/Module_Pluggable/lib/Acme/Foo-Bar.pm | 6
t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm | 9 +
t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo | 9 +
t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp | 9 +
t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ | 9 +
t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm | 9 +
44 files changed, 344 insertions(+), 81 deletions(-)
--- NEW FILE perl-update-Module-Pluggable.patch ---
This patch is derived from the perl-5.10.1 tarball as released on the CPAN.
diff -urN perl-5.10.0.orig/lib/Devel/InnerPackage.pm perl-5.10.0/lib/Devel/InnerPackage.pm
--- perl-5.10.0.orig/lib/Devel/InnerPackage.pm 2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Devel/InnerPackage.pm 2009-08-31 19:47:24.444773931 -0700
@@ -17,7 +17,7 @@
=head1 SYNOPSIS
use Foo::Bar;
- use Devel::innerPackage qw(list_packages);
+ use Devel::InnerPackage qw(list_packages);
my @inner_packages = list_packages('Foo::Bar');
@@ -75,7 +75,7 @@
!__PACKAGE__->_loaded($pack.$cand); # or @children;
push @packs, @children;
}
- return grep {$_ !~ /::::ISA::CACHE/} @packs;
+ return grep {$_ !~ /::(::ISA::CACHE|SUPER)/} @packs;
}
### XXX this is an inlining of the Class-Inspector->loaded()
diff -urN perl-5.10.0.orig/lib/Module/Pluggable/Object.pm perl-5.10.0/lib/Module/Pluggable/Object.pm
--- perl-5.10.0.orig/lib/Module/Pluggable/Object.pm 2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable/Object.pm 2009-08-31 19:47:24.446771196 -0700
@@ -6,10 +6,9 @@
use File::Spec::Functions qw(splitdir catdir curdir catfile abs2rel);
use Carp qw(croak carp);
use Devel::InnerPackage;
-use Data::Dumper;
use vars qw($VERSION);
-$VERSION = '3.6';
+$VERSION = '3.9';
sub new {
@@ -20,6 +19,10 @@
}
+### Eugggh, this code smells
+### This is what happens when you keep adding patches
+### *sigh*
+
sub plugins {
my $self = shift;
@@ -30,14 +33,14 @@
my $filename = $self->{'filename'};
my $pkg = $self->{'package'};
+ # Get the exception params instantiated
+ $self->_setup_exceptions;
+
# automatically turn a scalar search path or namespace into a arrayref
for (qw(search_path search_dirs)) {
$self->{$_} = [ $self->{$_} ] if exists $self->{$_} && !ref($self->{$_});
}
-
-
-
# default search path is '<Module>::<Name>::Plugin'
$self->{'search_path'} = ["${pkg}::Plugin"] unless $self->{'search_path'};
@@ -46,13 +49,14 @@
# check to see if we're running under test
- my @SEARCHDIR = exists $INC{"blib.pm"} && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
+ my @SEARCHDIR = exists $INC{"blib.pm"} && defined $filename && $filename =~ m!(^|/)blib/! ? grep {/blib/} @INC : @INC;
# add any search_dir params
unshift @SEARCHDIR, @{$self->{'search_dirs'}} if defined $self->{'search_dirs'};
my @plugins = $self->search_directories(@SEARCHDIR);
+ push(@plugins, $self->handle_innerpackages($_)) for @{$self->{'search_path'}};
# push @plugins, map { print STDERR "$_\n"; $_->require } list_packages($_) for (@{$self->{'search_path'}});
@@ -60,43 +64,12 @@
return () unless @plugins;
- # exceptions
- my %only;
- my %except;
- my $only;
- my $except;
-
- if (defined $self->{'only'}) {
- if (ref($self->{'only'}) eq 'ARRAY') {
- %only = map { $_ => 1 } @{$self->{'only'}};
- } elsif (ref($self->{'only'}) eq 'Regexp') {
- $only = $self->{'only'}
- } elsif (ref($self->{'only'}) eq '') {
- $only{$self->{'only'}} = 1;
- }
- }
-
-
- if (defined $self->{'except'}) {
- if (ref($self->{'except'}) eq 'ARRAY') {
- %except = map { $_ => 1 } @{$self->{'except'}};
- } elsif (ref($self->{'except'}) eq 'Regexp') {
- $except = $self->{'except'}
- } elsif (ref($self->{'except'}) eq '') {
- $except{$self->{'except'}} = 1;
- }
- }
-
# remove duplicates
# probably not necessary but hey ho
my %plugins;
for(@plugins) {
- next if (keys %only && !$only{$_} );
- next unless (!defined $only || m!$only! );
-
- next if (keys %except && $except{$_} );
- next if (defined $except && m!$except! );
+ next unless $self->_is_legit($_);
$plugins{$_} = 1;
}
@@ -112,6 +85,58 @@
}
+sub _setup_exceptions {
+ my $self = shift;
+
+ my %only;
+ my %except;
+ my $only;
+ my $except;
+
+ if (defined $self->{'only'}) {
+ if (ref($self->{'only'}) eq 'ARRAY') {
+ %only = map { $_ => 1 } @{$self->{'only'}};
+ } elsif (ref($self->{'only'}) eq 'Regexp') {
+ $only = $self->{'only'}
+ } elsif (ref($self->{'only'}) eq '') {
+ $only{$self->{'only'}} = 1;
+ }
+ }
+
+
+ if (defined $self->{'except'}) {
+ if (ref($self->{'except'}) eq 'ARRAY') {
+ %except = map { $_ => 1 } @{$self->{'except'}};
+ } elsif (ref($self->{'except'}) eq 'Regexp') {
+ $except = $self->{'except'}
+ } elsif (ref($self->{'except'}) eq '') {
+ $except{$self->{'except'}} = 1;
+ }
+ }
+ $self->{_exceptions}->{only_hash} = \%only;
+ $self->{_exceptions}->{only} = $only;
+ $self->{_exceptions}->{except_hash} = \%except;
+ $self->{_exceptions}->{except} = $except;
+
+}
+
+sub _is_legit {
+ my $self = shift;
+ my $plugin = shift;
+ my %only = %{$self->{_exceptions}->{only_hash}||{}};
+ my %except = %{$self->{_exceptions}->{except_hash}||{}};
+ my $only = $self->{_exceptions}->{only};
+ my $except = $self->{_exceptions}->{except};
+
+ return 0 if (keys %only && !$only{$plugin} );
+ return 0 unless (!defined $only || $plugin =~ m!$only! );
+
+ return 0 if (keys %except && $except{$plugin} );
+ return 0 if (defined $except && $plugin =~ m!$except! );
+
+ return 1;
+}
+
sub search_directories {
my $self = shift;
my @SEARCHDIR = @_;
@@ -121,7 +146,6 @@
foreach my $dir (@SEARCHDIR) {
push @plugins, $self->search_paths($dir);
}
-
return @plugins;
}
@@ -151,6 +175,8 @@
# parse the file to get the name
my ($name, $directory, $suffix) = fileparse($file, $file_regex);
+ next if (!$self->{include_editor_junk} && $self->_is_editor_junk($name));
+
$directory = abs2rel($directory, $sp);
# If we have a mixed-case package name, assume case has been preserved
@@ -203,17 +229,34 @@
# now add stuff that may have been in package
# NOTE we should probably use all the stuff we've been given already
# but then we can't unload it :(
- push @plugins, $self->handle_innerpackages($searchpath) unless (exists $self->{inner} && !$self->{inner});
+ push @plugins, $self->handle_innerpackages($searchpath);
} # foreach $searchpath
return @plugins;
}
+sub _is_editor_junk {
+ my $self = shift;
+ my $name = shift;
+
+ # Emacs (and other Unix-y editors) leave temp files ending in a
+ # tilde as a backup.
+ return 1 if $name =~ /~$/;
+ # Emacs makes these files while a buffer is edited but not yet
+ # saved.
+ return 1 if $name =~ /^\.#/;
+ # Vim can leave these files behind if it crashes.
+ return 1 if $name =~ /\.sw[po]$/;
+
+ return 0;
+}
+
sub handle_finding_plugin {
my $self = shift;
my $plugin = shift;
return unless (defined $self->{'instantiate'} || $self->{'require'});
+ return unless $self->_is_legit($plugin);
$self->_require($plugin);
}
@@ -245,10 +288,11 @@
sub handle_innerpackages {
my $self = shift;
+ return () if (exists $self->{inner} && !$self->{inner});
+
my $path = shift;
my @plugins;
-
foreach my $plugin (Devel::InnerPackage::list_packages($path)) {
my $err = $self->handle_finding_plugin($plugin);
#next if $err;
@@ -299,6 +343,14 @@
Optionally it instantiates those classes for you.
+This object is wrapped by C<Module::Pluggable>. If you want to do something
+odd or add non-general special features you're probably best to wrap this
+and produce your own subclass.
+
+=head1 OPTIONS
+
+See the C<Module::Pluggable> docs.
+
=head1 AUTHOR
Simon Wistow <simon at thegestalt.org>
diff -urN perl-5.10.0.orig/lib/Module/Pluggable.pm perl-5.10.0/lib/Module/Pluggable.pm
--- perl-5.10.0.orig/lib/Module/Pluggable.pm 2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/lib/Module/Pluggable.pm 2009-08-31 19:47:24.448771465 -0700
@@ -9,7 +9,7 @@
# Peter Gibbons: I wouldn't say I've been missing it, Bob!
-$VERSION = '3.6';
+$VERSION = '3.9';
sub import {
my $class = shift;
@@ -60,8 +60,9 @@
no strict 'refs';
- no warnings 'redefine';
- *{"$package\::$sub"} = $subroutine;
+ no warnings qw(redefine prototype);
+
+ *{"$package\::$sub"} = $subroutine;
*{"$package\::search_path"} = $searchsub;
*{"$package\::only"} = $onlysub;
*{"$package\::except"} = $exceptsub;
@@ -297,6 +298,14 @@
file_regex => qr/\.plugin$/
+=head2 include_editor_junk
+
+By default C<Module::Pluggable> ignores files that look like they were
+left behind by editors. Currently this means files ending in F<~> (~),
+the extensions F<.swp> or F<.swo>, or files beginning with F<.#>.
+
+Setting C<include_editor_junk> changes C<Module::Pluggable> so it does
+not ignore any files it finds.
=head1 METHODs
diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
--- perl-5.10.0.orig/MANIFEST 2007-12-18 02:47:07.000000000 -0800
+++ perl-5.10.0/MANIFEST 2009-08-31 19:47:24.452770885 -0700
@@ -3612,11 +3612,14 @@
t/Module_Pluggable/09require.t Module::Pluggable tests
t/Module_Pluggable/10innerpack_inner.t Module::Pluggable tests
t/Module_Pluggable/10innerpack_noinner.t Module::Pluggable tests
+t/Module_Pluggable/10innerpack_onefile.t Module::Pluggable tests
t/Module_Pluggable/10innerpack_override.t Module::Pluggable tests
+t/Module_Pluggable/10innerpack_super.t Module::Pluggable tests
t/Module_Pluggable/10innerpack.t Module::Pluggable tests
t/Module_Pluggable/11usetwice.t Module::Pluggable tests
t/Module_Pluggable/12onlyarray.t Module::Pluggable tests
t/Module_Pluggable/12onlyregex.t Module::Pluggable tests
+t/Module_Pluggable/12onlyrequire.t Module::Pluggable tests
t/Module_Pluggable/12only.t Module::Pluggable tests
t/Module_Pluggable/13exceptarray.t Module::Pluggable tests
t/Module_Pluggable/13exceptregex.t Module::Pluggable tests
@@ -3628,8 +3631,15 @@
t/Module_Pluggable/18skipped_package.t Module::Pluggable tests
t/Module_Pluggable/19can_ok_clobber.t Module::Pluggable tests
t/Module_Pluggable/20dodgy_files.t Module::Pluggable tests
+t/Module_Pluggable/21editor_junk.t Module::Pluggable tests
t/Module_Pluggable/acme/Acme/MyTest/Plugin/Foo.pm Module::Pluggable tests
t/Module_Pluggable/lib/Acme/MyTest/Plugin/Foo.pm Module::Pluggable tests
+t/Module_Pluggable/lib/Acme/Foo-Bar.pm Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ Module::Pluggable tests
+t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm Module::Pluggable tests
t/Module_Pluggable/lib/ExtTest/Plugin/Bar.plugin Module::Pluggable tests
t/Module_Pluggable/lib/ExtTest/Plugin/Foo.plugin Module::Pluggable tests
t/Module_Pluggable/lib/ExtTest/Plugin/Quux/Foo.plugin Module::Pluggable tests
@@ -3646,6 +3656,7 @@
t/Module_Pluggable/lib/OddTest/Plugin/-Dodgy.pm Module::Pluggable tests
t/Module_Pluggable/lib/OddTest/Plugin/Foo.pm Module::Pluggable tests
t/Module_Pluggable/lib/TA/C/A/I.pm Module::Pluggable tests
+t/Module_Pluggable/lib/Zot/.Zork.pm Module::Pluggable tests
t/mro/basic_01_c3.t mro tests
t/mro/basic_01_dfs.t mro tests
t/mro/basic_02_c3.t mro tests
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t perl-5.10.0/t/Module_Pluggable/02alsoworks.t
--- perl-5.10.0.orig/t/Module_Pluggable/02alsoworks.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02alsoworks.t 2009-08-31 19:47:24.454770805 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 5;
my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/02works.t perl-5.10.0/t/Module_Pluggable/02works.t
--- perl-5.10.0.orig/t/Module_Pluggable/02works.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/02works.t 2009-08-31 19:47:24.455771358 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 5;
my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/03diffname.t perl-5.10.0/t/Module_Pluggable/03diffname.t
--- perl-5.10.0.orig/t/Module_Pluggable/03diffname.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/03diffname.t 2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t perl-5.10.0/t/Module_Pluggable/04acmedir_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir_single.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir_single.t 2009-08-31 19:47:24.456771493 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t perl-5.10.0/t/Module_Pluggable/04acmedir.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmedir.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmedir.t 2009-08-31 19:47:24.457771627 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t perl-5.10.0/t/Module_Pluggable/04acmepath_single.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath_single.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath_single.t 2009-08-31 19:47:24.458773508 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t perl-5.10.0/t/Module_Pluggable/04acmepath.t
--- perl-5.10.0.orig/t/Module_Pluggable/04acmepath.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/04acmepath.t 2009-08-31 19:47:24.459772105 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/05postpath.t perl-5.10.0/t/Module_Pluggable/05postpath.t
--- perl-5.10.0.orig/t/Module_Pluggable/05postpath.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/05postpath.t 2009-08-31 19:47:24.460771332 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/06multipath.t perl-5.10.0/t/Module_Pluggable/06multipath.t
--- perl-5.10.0.orig/t/Module_Pluggable/06multipath.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/06multipath.t 2009-08-31 19:47:24.461771676 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t perl-5.10.0/t/Module_Pluggable/07instantiate.t
--- perl-5.10.0.orig/t/Module_Pluggable/07instantiate.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/07instantiate.t 2009-08-31 19:47:24.462772090 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 6;
my $foo;
@@ -26,7 +26,7 @@
use File::Spec::Functions qw(catdir);
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'booga', instantiate => 'new');
use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'wooga', instantiate => 'nosomuchmethod');
diff -urN perl-5.10.0.orig/t/Module_Pluggable/08nothing.t perl-5.10.0/t/Module_Pluggable/08nothing.t
--- perl-5.10.0.orig/t/Module_Pluggable/08nothing.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/08nothing.t 2009-08-31 19:47:24.463771316 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 2;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/09require.t perl-5.10.0/t/Module_Pluggable/09require.t
--- perl-5.10.0.orig/t/Module_Pluggable/09require.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/09require.t 2009-08-31 19:47:24.464771800 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 2;
my $t = MyTest->new();
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_inner.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_inner.t 2009-08-31 19:47:24.465771515 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_noinner.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_noinner.t 2009-08-31 19:47:24.479772629 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_onefile.t 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_onefile.t 2009-08-31 19:47:24.480772134 -0700
@@ -0,0 +1,27 @@
+#!perl -wT
+
+use strict;
+use Test::More tests => 2;
+use Data::Dumper;
+
+my $mc = MyClass->new();
+my $mc2 = MyClass2->new();
+
+
+is_deeply([$mc->plugins], [qw(MyClass::Plugin::MyPlugin)], "Got inner plugin");
+is_deeply([$mc2->plugins], [], "Didn't get plugin");
+
+package MyClass::Plugin::MyPlugin;
+sub pretty { print "I am pretty" };
+
+package MyClass;
+use Module::Pluggable inner => 1;
+
+sub new { return bless {}, $_[0] }
+
+package MyClass2;
+use Module::Pluggable search_path => "MyClass::Plugin", inner => 0;
+
+sub new { return bless {}, $_[0] }
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t perl-5.10.0/t/Module_Pluggable/10innerpack_override.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_override.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_override.t 2009-08-31 19:47:24.481771501 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t perl-5.10.0/t/Module_Pluggable/10innerpack_super.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack_super.t 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack_super.t 2009-08-31 19:47:24.482771565 -0700
@@ -0,0 +1,29 @@
+#!perl -wT
+
+use Test::More tests => 3;
+use strict;
+use_ok('Devel::InnerPackage');
+Bar->whee;
+is_deeply([Devel::InnerPackage::list_packages("Bar")],[], "Don't pick up ::SUPER pseudo stash");
+is_deeply([Devel::InnerPackage::list_packages("Foo")],['Foo::Bar'], "Still pick up other inner package");
+
+package Foo;
+
+sub whee {
+ 1;
+}
+
+package Foo::Bar;
+
+sub whee {}
+
+package Bar;
+use base 'Foo';
+
+sub whee {
+ shift->SUPER::whee;
+ 2;
+}
+
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t perl-5.10.0/t/Module_Pluggable/10innerpack.t
--- perl-5.10.0.orig/t/Module_Pluggable/10innerpack.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/10innerpack.t 2009-08-31 19:47:24.483771909 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 4;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t perl-5.10.0/t/Module_Pluggable/11usetwice.t
--- perl-5.10.0.orig/t/Module_Pluggable/11usetwice.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/11usetwice.t 2009-08-31 19:47:24.484771624 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 3;
my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t perl-5.10.0/t/Module_Pluggable/12onlyarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyarray.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyarray.t 2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 10;
{
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t perl-5.10.0/t/Module_Pluggable/12onlyregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyregex.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyregex.t 2009-08-31 19:47:24.485772038 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 10;
{
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t perl-5.10.0/t/Module_Pluggable/12onlyrequire.t
--- perl-5.10.0.orig/t/Module_Pluggable/12onlyrequire.t 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12onlyrequire.t 2009-08-31 19:47:24.505021273 -0700
@@ -0,0 +1,21 @@
+#!perl -w
+use strict;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Test::More tests => 2;
+
+my @packages = eval { Zot->_dist_types };
+is($@, '', "No warnings");
+is(scalar(@packages), 0, "Correctly only got 1 package");
+
+
+package Zot;
+use strict;
+use Module::Pluggable (
+ sub_name => '_dist_types',
+ search_path => __PACKAGE__,
+ only => qr/Zot::\w+$/,
+ require => 1,
+ );
+
+1;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/12only.t perl-5.10.0/t/Module_Pluggable/12only.t
--- perl-5.10.0.orig/t/Module_Pluggable/12only.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/12only.t 2009-08-31 19:47:24.506022385 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 10;
{
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t perl-5.10.0/t/Module_Pluggable/13exceptarray.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptarray.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptarray.t 2009-08-31 19:47:24.507021263 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 10;
{
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t perl-5.10.0/t/Module_Pluggable/13exceptregex.t
--- perl-5.10.0.orig/t/Module_Pluggable/13exceptregex.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13exceptregex.t 2009-08-31 19:47:24.510021945 -0700
@@ -1,8 +1,8 @@
-#!perl -w
+#!perl -wT
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 10;
{
diff -urN perl-5.10.0.orig/t/Module_Pluggable/13except.t perl-5.10.0/t/Module_Pluggable/13except.t
--- perl-5.10.0.orig/t/Module_Pluggable/13except.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/13except.t 2009-08-31 19:47:24.511021381 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 10;
{
diff -urN perl-5.10.0.orig/t/Module_Pluggable/14package.t perl-5.10.0/t/Module_Pluggable/14package.t
--- perl-5.10.0.orig/t/Module_Pluggable/14package.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/14package.t 2009-08-31 19:47:24.842414378 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 5;
my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t perl-5.10.0/t/Module_Pluggable/15topicsafe.t
--- perl-5.10.0.orig/t/Module_Pluggable/15topicsafe.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/15topicsafe.t 2009-08-31 19:47:24.842774343 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More 'no_plan';
use Module::Pluggable search_path => 'Acme::MyTest';
diff -urN perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t perl-5.10.0/t/Module_Pluggable/16different_extension.t
--- perl-5.10.0.orig/t/Module_Pluggable/16different_extension.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/16different_extension.t 2009-08-31 19:47:24.843800947 -0700
@@ -2,7 +2,7 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests => 5;
my $foo;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/17devel_inner_package.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/17devel_inner_package.t 2009-08-31 19:47:24.843800947 -0700
@@ -3,7 +3,7 @@
use Devel::InnerPackage qw(list_packages);
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
my @packages;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t perl-5.10.0/t/Module_Pluggable/18skipped_package.t
--- perl-5.10.0.orig/t/Module_Pluggable/18skipped_package.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/18skipped_package.t 2009-08-31 19:47:24.844780129 -0700
@@ -2,7 +2,7 @@
use Test::More tests => 1;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Devel::InnerPackage qw(list_packages);
use No::Middle;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t
--- perl-5.10.0.orig/t/Module_Pluggable/19can_ok_clobber.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/19can_ok_clobber.t 2009-08-31 19:47:24.844780129 -0700
@@ -3,7 +3,7 @@
use warnings;
use Data::Dumper;
use FindBin;
-use lib "$FindBin::Bin/lib";
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
use Test::More tests=>5;
diff -urN perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t perl-5.10.0/t/Module_Pluggable/20dodgy_files.t
--- perl-5.10.0.orig/t/Module_Pluggable/20dodgy_files.t 2007-12-18 02:47:08.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/20dodgy_files.t 2009-08-31 19:47:24.845769158 -0700
@@ -1,7 +1,7 @@
#!perl -w
BEGIN {
- if ($^O eq 'VMS') {
+ if ($^O eq 'VMS' || $^O eq 'VOS') {
print "1..0 # Skip: can't handle misspelled plugin names\n";
exit;
}
@@ -9,8 +9,18 @@
use strict;
use FindBin;
-use lib "$FindBin::Bin/lib";
-use Test::More tests => 5;
+use Test::More;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use File::Spec::Functions qw(catfile);
+
+
+my ($dodgy_file) = (catfile($FindBin::Bin, "lib", "OddTest", "Plugin", "-Dodgy.pm")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+ plan skip_all => "Can't handle misspelled plugin names\n";
+} else {
+ plan tests => 5;
+}
+
my $foo;
ok($foo = OddTest->new());
diff -urN perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t perl-5.10.0/t/Module_Pluggable/21editor_junk.t
--- perl-5.10.0.orig/t/Module_Pluggable/21editor_junk.t 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/21editor_junk.t 2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,53 @@
+#!perl -w
+
+use Test::More;
+use FindBin;
+use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
+use Module::Pluggable::Object;
+use File::Spec::Functions qw(catfile);
+
+my ($dodgy_file) = (catfile($FindBin::Bin,"lib", "EditorJunk", "Plugin", "#Bar.pm#")=~/^(.*)$/);
+unless (-f $dodgy_file) {
+ plan skip_all => "Can't handle plugin names with octothorpes\n";
+} else {
+ plan tests => 4;
+}
+
+
+
+my $foo;
+ok($foo = EditorJunk->new());
+
+my @plugins;
+my @expected = qw(EditorJunk::Plugin::Bar EditorJunk::Plugin::Foo);
+ok(@plugins = sort $foo->plugins);
+
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+my $mpo = Module::Pluggable::Object->new(
+ package => 'EditorJunk',
+ filename => __FILE__,
+ include_editor_junk => 1,
+);
+
+ at expected = ('EditorJunk::Plugin::.#Bar', 'EditorJunk::Plugin::Bar', 'EditorJunk::Plugin::Foo');
+ at plugins = sort $mpo->plugins();
+is_deeply(\@plugins, \@expected, "is deeply");
+
+
+
+package EditorJunk;
+
+use strict;
+use Module::Pluggable;
+
+
+sub new {
+ my $class = shift;
+ return bless {}, $class;
+
+}
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/Acme/Foo-Bar.pm 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/Acme/Foo-Bar.pm 2009-08-31 19:47:24.845769158 -0700
@@ -0,0 +1,6 @@
+package Acme::FooBar;
+
+our $quux = "hello";
+
+1;
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm 2009-08-31 19:47:24.846769084 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm~ 2009-08-31 19:47:24.851770803 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swo 2009-08-31 19:47:24.852771985 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Bar.pm.swp 2009-08-31 19:47:24.853771770 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Bar;
+
+
+use strict;
+
+
+1;
+
+
diff -urN perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm
--- perl-5.10.0.orig/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm 1969-12-31 16:00:00.000000000 -0800
+++ perl-5.10.0/t/Module_Pluggable/lib/EditorJunk/Plugin/Foo.pm 2009-08-31 19:47:24.854771835 -0700
@@ -0,0 +1,9 @@
+package EditorJunk::Foo;
+
+
+use strict;
+
+
+1;
+
+
perl-update-Test-Simple.patch:
MANIFEST | 25
lib/Test/Builder.pm | 1430 +++++++++++-------
lib/Test/Builder/Module.pm | 39
lib/Test/Builder/Tester.pm | 249 +--
lib/Test/Builder/Tester/Color.pm | 5
lib/Test/More.pm | 592 ++++---
lib/Test/Simple.pm | 38
lib/Test/Simple/Changes | 226 ++
lib/Test/Simple/README | 7
lib/Test/Simple/t/BEGIN_require_ok.t | 27
lib/Test/Simple/t/BEGIN_use_ok.t | 26
lib/Test/Simple/t/More.t | 9
lib/Test/Simple/t/bad_plan.t | 29
lib/Test/Simple/t/bail_out.t | 16
lib/Test/Simple/t/c_flag.t | 21
lib/Test/Simple/t/cmp_ok.t | 37
lib/Test/Simple/t/create.t | 21
lib/Test/Simple/t/curr_test.t | 11
lib/Test/Simple/t/current_test.t | 11
lib/Test/Simple/t/current_test_without_plan.t | 16
lib/Test/Simple/t/details.t | 13
lib/Test/Simple/t/diag.t | 67
lib/Test/Simple/t/died.t | 45
lib/Test/Simple/t/done_testing.t | 12
lib/Test/Simple/t/done_testing_double.t | 46
lib/Test/Simple/t/done_testing_plan_mismatch.t | 44
lib/Test/Simple/t/done_testing_with_no_plan.t | 11
lib/Test/Simple/t/done_testing_with_number.t | 12
lib/Test/Simple/t/done_testing_with_plan.t | 11
lib/Test/Simple/t/dont_overwrite_die_handler.t | 19
lib/Test/Simple/t/exit.t | 134 -
lib/Test/Simple/t/explain.t | 27
lib/Test/Simple/t/extra.t | 2
lib/Test/Simple/t/extra_one.t | 2
lib/Test/Simple/t/fail-like.t | 39
lib/Test/Simple/t/fail-more.t | 458 ++++-
lib/Test/Simple/t/fail.t | 62
lib/Test/Simple/t/fail_one.t | 47
lib/Test/Simple/t/filehandles.t | 9
lib/Test/Simple/t/fork_with_new_stdout.t | 54
lib/Test/Simple/t/is_deeply_dne_bug.t | 11
lib/Test/Simple/t/is_deeply_fail.t | 6
lib/Test/Simple/t/is_deeply_with_threads.t | 11
lib/Test/Simple/t/lib/Dev/Null.pm | 8
lib/Test/Simple/t/lib/Dummy.pm | 5
lib/Test/Simple/t/lib/MyOverload.pm | 27
lib/Test/Simple/t/lib/SigDie.pm | 8
lib/Test/Simple/t/maybe_regex.t | 24
lib/Test/Simple/t/missing.t | 8
lib/Test/Simple/t/new_ok.t | 42
lib/Test/Simple/t/no_plan.t | 23
lib/Test/Simple/t/no_plan_at_all.t | 35
lib/Test/Simple/t/no_tests.t | 44
lib/Test/Simple/t/note.t | 30
lib/Test/Simple/t/output.t | 128 -
lib/Test/Simple/t/overload.t | 44
lib/Test/Simple/t/overload_threads.t | 11
lib/Test/Simple/t/plan_bad.t | 5
lib/Test/Simple/t/plan_is_noplan.t | 46
lib/Test/Simple/t/reset.t | 77
lib/Test/Simple/t/reset_outputs.t | 35
lib/Test/Simple/t/skip.t | 2
lib/Test/Simple/t/skipall.t | 41
lib/Test/Simple/t/tbm_doesnt_set_exported_to.t | 24
lib/Test/Simple/t/thread_taint.t | 2
lib/Test/Simple/t/todo.t | 86 +
lib/Test/Simple/t/try.t | 37
lib/Test/Simple/t/undef.t | 32
lib/Test/Simple/t/use_ok.t | 11
lib/Test/Simple/t/utf8.t | 69
lib/Test/Simple/t/versions.t | 21
t/lib/Test/Builder/NoOutput.pm | 122 +
t/lib/Test/Simple/Catch.pm | 6
t/lib/Test/Simple/sample_tests/death.plx | 7
t/lib/Test/Simple/sample_tests/death_with_handler.plx | 20
t/lib/Test/Simple/sample_tests/last_minute_death.plx | 7
t/lib/Test/Simple/sample_tests/too_few_fail.plx | 2
t/lib/TieOut.pm | 8
78 files changed, 3459 insertions(+), 1615 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 perl-update-Test-Simple.patchIndex: perl-update-Test-Simple.patch
===================================================================
RCS file: /cvs/extras/rpms/perl/F-12/perl-update-Test-Simple.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- perl-update-Test-Simple.patch 11 Mar 2009 21:12:37 -0000 1.1
+++ perl-update-Test-Simple.patch 3 Sep 2009 16:18:27 -0000 1.2
@@ -1,116 +1,13 @@
-Test-Simple-0.86
+Update to 0.92; patch by Iain Arnell <iarnell at gmail.com> (BZ#519417)
-the following made the patch smaller:
-mv Test-Simple-0.86/t/{Builder,Tester,}
-
-diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST
---- perl-5.10.0.orig/MANIFEST 2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/MANIFEST 2009-02-17 17:16:40.000000000 +0100
-@@ -2626,11 +2626,16 @@
- lib/Test/Simple/Changes Test::Simple changes
- lib/Test/Simple.pm Basic utility for writing tests
- lib/Test/Simple/README Test::Simple README
-+lib/Test/Simple/TODO Test::Simple TODO
- lib/Test/Simple/t/00test_harness_check.t Test::Simple test
-+lib/Test/Simple/t/BEGIN_require_ok.t
-+lib/Test/Simple/t/BEGIN_use_ok.t
-+lib/Test/Simple/t/Builder.t Test::Builder tests
-+lib/Test/Simple/t/More.t Test::More test, basic stuff
- lib/Test/Simple/t/bad_plan.t Test::Builder plan() test
- lib/Test/Simple/t/bail_out.t Test::Builder BAIL_OUT test
- lib/Test/Simple/t/buffer.t Test::Builder buffering test
--lib/Test/Simple/t/Builder.t Test::Builder tests
-+lib/Test/Simple/t/c_flag.t
- lib/Test/Simple/t/carp.t Test::Builder test
- lib/Test/Simple/t/circular_data.t Test::Simple test
- lib/Test/Simple/t/cmp_ok.t Test::More test
-@@ -2638,19 +2643,22 @@
- lib/Test/Simple/t/curr_test.t Test::Builder->curr_test tests
- lib/Test/Simple/t/details.t Test::Builder tests
- lib/Test/Simple/t/diag.t Test::More diag() test
-+lib/Test/Simple/t/died.t
-+lib/Test/Simple/t/dont_overwrite_die_handler.t
- lib/Test/Simple/t/eq_set.t Test::Simple test
- lib/Test/Simple/t/exit.t Test::Simple test, exit codes
--lib/Test/Simple/t/extra_one.t Test::Simple test
-+lib/Test/Simple/t/explain.t
- lib/Test/Simple/t/extra.t Test::Simple test
-+lib/Test/Simple/t/extra_one.t Test::Simple test
- lib/Test/Simple/t/fail-like.t Test::More test, like() failures
- lib/Test/Simple/t/fail-more.t Test::More test, tests failing
--lib/Test/Simple/t/fail_one.t Test::Simple test
- lib/Test/Simple/t/fail.t Test::Simple test, test failures
-+lib/Test/Simple/t/fail_one.t Test::Simple test
- lib/Test/Simple/t/filehandles.t Test::Simple test, STDOUT can be played with
- lib/Test/Simple/t/fork.t Test::More fork tests
- lib/Test/Simple/t/harness_active.t Test::Simple test
--lib/Test/Simple/t/has_plan2.t Test::More->plan tests
- lib/Test/Simple/t/has_plan.t Test::Builder->plan tests
-+lib/Test/Simple/t/has_plan2.t Test::More->plan tests
- lib/Test/Simple/t/import.t Test::More test, importing functions
- lib/Test/Simple/t/is_deeply_dne_bug.t Test::More test
- lib/Test/Simple/t/is_deeply_fail.t Test::More test, is_deeply()
-@@ -2660,27 +2668,30 @@
- lib/Test/Simple/t/lib/MyOverload.pm Test::More test module
- lib/Test/Simple/t/maybe_regex.t Test::Builder->maybe_regex() tests
- lib/Test/Simple/t/missing.t Test::Simple test, missing tests
--lib/Test/Simple/t/More.t Test::More test, basic stuff
-+lib/Test/Simple/t/new_ok.t
- lib/Test/Simple/t/no_diag.t Test::Simple test
- lib/Test/Simple/t/no_ending.t Test::Builder test, no_ending()
- lib/Test/Simple/t/no_header.t Test::Builder test, no_header()
- lib/Test/Simple/t/no_plan.t Test::Simple test, forgot the plan
--lib/Test/Simple/TODO Test::Simple TODO
-+lib/Test/Simple/t/no_tests.t
-+lib/Test/Simple/t/note.t
- lib/Test/Simple/t/ok_obj.t Test::Builder object tests
- lib/Test/Simple/t/output.t Test::Builder test, output methods
- lib/Test/Simple/t/overload.t Test::Simple test
- lib/Test/Simple/t/overload_threads.t Test::Simple test
-+lib/Test/Simple/t/plan.t Test::More test, plan()
- lib/Test/Simple/t/plan_bad.t Test::Simple test
- lib/Test/Simple/t/plan_is_noplan.t Test::Simple test, no_plan
- lib/Test/Simple/t/plan_no_plan.t Test::More test, plan() w/no_plan
- lib/Test/Simple/t/plan_shouldnt_import.t Test::Simple test
- lib/Test/Simple/t/plan_skip_all.t Test::More test, plan() w/skip_all
--lib/Test/Simple/t/plan.t Test::More test, plan()
- lib/Test/Simple/t/require_ok.t Test::Simple test
- lib/Test/Simple/t/reset.t Test::Simple test
-+lib/Test/Simple/t/reset_outputs.t
- lib/Test/Simple/t/simple.t Test::Simple test, basic stuff
--lib/Test/Simple/t/skipall.t Test::More test, skip all tests
- lib/Test/Simple/t/skip.t Test::More test, SKIP tests
-+lib/Test/Simple/t/skipall.t Test::More test, skip all tests
-+lib/Test/Simple/t/tbm_doesnt_set_exported_to.t
- lib/Test/Simple/t/tbt_01basic.t Test::Builder::Tester test
- lib/Test/Simple/t/tbt_02fhrestore.t Test::Builder::Tester test
- lib/Test/Simple/t/tbt_03die.t Test::Builder::Tester test
-@@ -2688,13 +2699,14 @@
- lib/Test/Simple/t/tbt_05faildiag.t Test::Builder::Tester test
- lib/Test/Simple/t/tbt_06errormess.t Test::Builder::Tester test
- lib/Test/Simple/t/tbt_07args.t Test::Builder::Tester test
--lib/Test/Simple/t/threads.t Test::Builder thread-safe checks
- lib/Test/Simple/t/thread_taint.t Test::Simple test
-+lib/Test/Simple/t/threads.t Test::Builder thread-safe checks
- lib/Test/Simple/t/todo.t Test::More test, TODO tests
- lib/Test/Simple/t/try.t Test::More test
- lib/Test/Simple/t/undef.t Test::More test, undefs don't cause warnings
--lib/Test/Simple/t/useing.t Test::More test, compile test
- lib/Test/Simple/t/use_ok.t Test::More test, use_ok()
-+lib/Test/Simple/t/useing.t Test::More test, compile test
-+lib/Test/Simple/t/utf8.t
- lib/Test/t/05_about_verbose.t See if Test works
- lib/Test/t/fail.t See if Test works
- lib/Test/t/mix.t See if Test works
diff -urN perl-5.10.0.orig/lib/Test/Builder/Module.pm perl-5.10.0/lib/Test/Builder/Module.pm
--- perl-5.10.0.orig/lib/Test/Builder/Module.pm 2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Module.pm 2009-02-17 17:16:40.000000000 +0100
++++ perl-5.10.0/lib/Test/Builder/Module.pm 2009-08-26 06:14:11.000000000 +0200
@@ -1,24 +1,24 @@
package Test::Builder::Module;
-+# $Id$
-+
-+use strict;
++use strict;
++
use Test::Builder;
require Exporter;
@@ -120,7 +17,8 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
-$VERSION = '0.72';
-
-use strict;
-+our $VERSION = '0.86';
++our $VERSION = '0.92';
++$VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval)
# 5.004's Exporter doesn't have export_to_level.
my $_export_to_level = sub {
@@ -208,14 +106,20 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
1;
diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm perl-5.10.0/lib/Test/Builder/Tester/Color.pm
--- perl-5.10.0.orig/lib/Test/Builder/Tester/Color.pm 2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm 2009-02-17 17:16:40.000000000 +0100
-@@ -1,4 +1,5 @@
++++ perl-5.10.0/lib/Test/Builder/Tester/Color.pm 2009-08-26 06:14:11.000000000 +0200
+@@ -1,9 +1,11 @@
package Test::Builder::Tester::Color;
-+# $Id$
use strict;
++our $VERSION = "1.18";
+
+ require Test::Builder::Tester;
-@@ -25,8 +26,7 @@
++
+ =head1 NAME
+
+ Test::Builder::Tester::Color - turn on colour in Test::Builder::Tester
+@@ -25,8 +27,7 @@
=cut
@@ -227,10 +131,9 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
diff -urN perl-5.10.0.orig/lib/Test/Builder/Tester.pm perl-5.10.0/lib/Test/Builder/Tester.pm
--- perl-5.10.0.orig/lib/Test/Builder/Tester.pm 2007-12-18 11:47:07.000000000 +0100
-+++ perl-5.10.0/lib/Test/Builder/Tester.pm 2009-02-17 17:16:40.000000000 +0100
-@@ -1,8 +1,8 @@
++++ perl-5.10.0/lib/Test/Builder/Tester.pm 2009-08-26 06:14:11.000000000 +0200
+@@ -1,8 +1,7 @@
package Test::Builder::Tester;
-+# $Id$
use strict;
-use vars qw(@EXPORT $VERSION @ISA);
@@ -239,7 +142,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
use Test::Builder;
use Symbol;
-@@ -56,21 +56,20 @@
+@@ -56,21 +55,20 @@
###
use Exporter;
@@ -269,7 +172,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
}
sub import {
-@@ -83,14 +82,14 @@
+@@ -83,14 +81,14 @@
$t->plan(@plan);
my @imports = ();
@@ -287,7 +190,7 @@ diff -urN perl-5.10.0.orig/lib/Test/Buil
}
###
-@@ -124,8 +123,7 @@
[...6118 lines suppressed...]
my $out = tie *$out_fh, 'TieOut';
my $err = tie *$err_fh, 'TieOut';
-@@ -13,6 +14,6 @@
+@@ -13,6 +15,6 @@
$t->failure_output($err_fh);
$t->todo_output($err_fh);
@@ -6035,12 +8073,8 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
1;
diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx
--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,16 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death.plx 2009-08-26 06:14:11.000000000 +0200
+@@ -4,10 +4,13 @@
require Test::Simple::Catch;
my($out, $err) = Test::Simple::Catch::caught();
@@ -6054,22 +8088,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
ok(1);
ok(1);
-die "Knife?";
++$! = 0;
+die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_in_eval.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_in_eval.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
- use Carp;
-
- push @INC, 't/lib';
diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx
--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/death_with_handler.plx 1970-01-01 01:00:00.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -0,0 +1,19 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/death_with_handler.plx 2009-08-26 06:14:11.000000000 +0200
+@@ -0,0 +1,20 @@
+require Test::Simple;
-+# $Id$
+
+push @INC, 't/lib';
+require Test::Simple::Catch;
@@ -6086,42 +8111,13 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
+
+ok(1);
+ok(1);
++
++$! = 0;
+die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/exit.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/exit.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,3 +1,4 @@
- require Test::Builder;
-+# $Id$
-
- exit 1;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/extras.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/extras.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/five_fail.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/five_fail.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
-
- use lib 't/lib';
- require Test::Simple::Catch;
diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx
--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/last_minute_death.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,11 +1,14 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
- require Test::Simple::Catch;
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/last_minute_death.plx 2009-08-26 06:14:11.000000000 +0200
+@@ -5,7 +5,9 @@
my($out, $err) = Test::Simple::Catch::caught();
Test::Simple->import(tests => 5);
@@ -6132,86 +8128,31 @@ diff -urN perl-5.10.0.orig/t/lib/Test/Si
ok(1);
ok(1);
-@@ -13,4 +16,4 @@
+@@ -13,4 +15,5 @@
ok(1);
ok(1);
-die "Almost there...";
++$! = 0;
+die "This is a test";
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/one_fail.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/one_fail.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/pre_plan_death.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/pre_plan_death.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- # ID 20020716.013, the exit code would become 0 if the test died
-+# $Id$
- # before a plan.
-
- require Test::Simple;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/require.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/require.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1 +1,2 @@
- require Test::Simple;
-+# $Id$
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/success.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/success.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
- require Test::Simple::Catch;
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
- require Test::Simple::Catch;
diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx
--- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/too_few_fail.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
- require Test::Simple::Catch;
-@@ -9,4 +10,4 @@
++++ perl-5.10.0/t/lib/Test/Simple/sample_tests/too_few_fail.plx 2009-08-26 06:14:11.000000000 +0200
+@@ -9,4 +9,4 @@
ok(0);
ok(1);
-ok(0);
\ No newline at end of file
+ok(0);
-diff -urN perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx
---- perl-5.10.0.orig/t/lib/Test/Simple/sample_tests/two_fail.plx 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/Test/Simple/sample_tests/two_fail.plx 2009-02-17 17:16:41.000000000 +0100
-@@ -1,4 +1,5 @@
- require Test::Simple;
-+# $Id$
-
- push @INC, 't/lib';
- require Test::Simple::Catch;
diff -urN perl-5.10.0.orig/t/lib/TieOut.pm perl-5.10.0/t/lib/TieOut.pm
--- perl-5.10.0.orig/t/lib/TieOut.pm 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/t/lib/TieOut.pm 2009-02-17 17:16:41.000000000 +0100
-@@ -1,13 +1,14 @@
++++ perl-5.10.0/t/lib/TieOut.pm 2009-08-26 06:14:11.000000000 +0200
+@@ -1,13 +1,15 @@
package TieOut;
-+# $Id$
++use strict;
++
sub TIEHANDLE {
my $scalar = '';
- bless( \$scalar, $_[0]);
@@ -6225,7 +8166,7 @@ diff -urN perl-5.10.0.orig/t/lib/TieOut.
}
sub PRINTF {
-@@ -16,7 +17,7 @@
+@@ -16,7 +18,7 @@
$$self .= sprintf $fmt, @_;
}
Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-12/perl.spec,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -p -r1.231 -r1.232
--- perl.spec 28 Aug 2009 05:39:58 -0000 1.231
+++ perl.spec 3 Sep 2009 16:18:27 -0000 1.232
@@ -7,7 +7,7 @@
Name: perl
Version: %{perl_version}
-Release: 81%{?dist}
+Release: 82%{?dist}
Epoch: %{perl_epoch}
Summary: Practical Extraction and Report Language
Group: Development/Languages
@@ -235,7 +235,7 @@ Patch113: perl-update-Sys-Syslog.patch
Patch114: perl-update-Test-Harness.patch
%define Test_Harness_version 3.16
Patch115: perl-update-Test-Simple.patch
-%define Test_Simple_version 0.86
+%define Test_Simple_version 0.92
Patch116: perl-update-Time-HiRes.patch
%define Time_HiRes_version 1.9719
Patch117: perl-update-Digest-SHA.patch
@@ -250,6 +250,8 @@ Patch120: perl-update-Compress_Raw_Zlib.
%define Compress_Raw_Zlib 2.020
Patch121: perl-update-Scalar-List-Utils.patch
%define Scalar_List_Utils 1.21
+Patch122: perl-update-Module-Pluggable.patch
+%define Module_Pluggable_version 3.90
# Fedora uses links instead of lynx
# patches File-Fetch and CPAN
@@ -772,7 +774,7 @@ Group: Development/Libraries
License: GPL+ or Artistic
# Epoch bump for clean upgrade over old standalone package
Epoch: 1
-Version: 3.60
+Version: %{Module_Pluggable_version}
Requires: perl = %{perl_epoch}:%{perl_version}-%{release}
%description Module-Pluggable
@@ -1032,6 +1034,12 @@ upstream tarball from perl.org.
%patch119 -p1
%patch120 -p1
%patch121 -p1
+%patch122 -p1
+# 0-byte files and patch don't seem to agree
+mkdir t/Module_Pluggable/lib/Zot/
+touch t/Module_Pluggable/lib/Zot/.Zork.pm
+
+
%patch201 -p1
#
@@ -1313,6 +1321,7 @@ perl -x patchlevel.h \
'Fedora Patch119: Update File::Spec to %{File_Spec_version}' \
'Fedora Patch120: Update Compress::Raw::Zlib to %{Compress_Raw_Zlib}' \
'Fedora Patch121: Update Scalar-List-Utils to %{Scalar_List_Utils}' \
+ 'Fedora Patch122: Update Module-Pluggable to %{Module_Pluggable_version}' \
'Fedora Patch201: Fedora uses links instead of lynx' \
%{nil}
@@ -1939,6 +1948,10 @@ TMPDIR="$PWD/tmp" make test
# Old changelog entries are preserved in CVS.
%changelog
+* Mon Aug 31 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-82
+- update our Test-Simple update to 0.92 (patch by Iain Arnell), #519417
+- update Module-Pluggable to 3.9
+
* Thu Aug 27 2009 Chris Weyl <cweyl at alumni.drew.edu> - 4:5.10.0-81
- fix macros.perl *sigh*
- Previous message (by thread): rpms/python-markdown2/EL-5 markdown2-old-pygments.patch, NONE, 1.1 import.log, 1.5, 1.6 python-markdown2.spec, 1.8, 1.9
- Next message (by thread): rpms/fsarchiver/devel .cvsignore, 1.10, 1.11 fsarchiver.spec, 1.17, 1.18 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list