rpms/perl/devel perl-update-Test-Simple.patch, 1.1, 1.2 perl.spec, 1.231, 1.232
Chris Weyl
cweyl at fedoraproject.org
Thu Sep 3 15:29:29 UTC 2009
Author: cweyl
Update of /cvs/extras/rpms/perl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19479
Modified Files:
perl-update-Test-Simple.patch perl.spec
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-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/devel/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 15:29:29 -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/devel/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 15:29:29 -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*
More information about the fedora-extras-commits
mailing list