diff --git a/perl-Eval-Closure-old_Test-More.patch b/perl-Eval-Closure-old_Test-More.patch deleted file mode 100644 index bb4ffb8..0000000 --- a/perl-Eval-Closure-old_Test-More.patch +++ /dev/null @@ -1,133 +0,0 @@ -Index: Eval-Closure-0.05/t/01-basic.t -=================================================================== ---- Eval-Closure-0.05.orig/t/01-basic.t -+++ Eval-Closure-0.05/t/01-basic.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use strict; - use warnings; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - - use Eval::Closure; -@@ -45,4 +45,4 @@ use Eval::Closure; - ok(!$code->(), "environment is clean"); - } - --done_testing; -+#done_testing; -Index: Eval-Closure-0.05/t/02-close-over.t -=================================================================== ---- Eval-Closure-0.05.orig/t/02-close-over.t -+++ Eval-Closure-0.05/t/02-close-over.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use strict; - use warnings; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - - use Eval::Closure; -@@ -52,4 +52,4 @@ use Test::Requires 'PadWalker'; - # it'd be nice if we could test that closing over other things wasn't possible, - # but perl's optimizer gets in the way of that - --done_testing; -+#done_testing; -Index: Eval-Closure-0.05/t/03-description.t -=================================================================== ---- Eval-Closure-0.05.orig/t/03-description.t -+++ Eval-Closure-0.05/t/03-description.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use strict; - use warnings; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - - use Eval::Closure; -@@ -50,4 +50,4 @@ SOURCE - "description is set" - ); - } --done_testing; -+#done_testing; -Index: Eval-Closure-0.05/t/04-canonicalize-source.t -=================================================================== ---- Eval-Closure-0.05.orig/t/04-canonicalize-source.t -+++ Eval-Closure-0.05/t/04-canonicalize-source.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use strict; - use warnings; --use Test::More; -+use Test::More qw(no_plan); - - use Eval::Closure; - -@@ -28,4 +28,4 @@ use Eval::Closure; - is($code->(), "foo", "got the right code"); - } - --done_testing; -+#done_testing; -Index: Eval-Closure-0.05/t/05-memoize.t -=================================================================== ---- Eval-Closure-0.05.orig/t/05-memoize.t -+++ Eval-Closure-0.05/t/05-memoize.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use strict; - use warnings; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - use Test::Requires 'Test::Output'; - -@@ -99,4 +99,4 @@ use Eval::Closure; - "got the right description"); - } - --done_testing; -+#done_testing; -Index: Eval-Closure-0.05/t/10-errors.t -=================================================================== ---- Eval-Closure-0.05.orig/t/10-errors.t -+++ Eval-Closure-0.05/t/10-errors.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use strict; - use warnings; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - - use Eval::Closure; -@@ -64,4 +64,4 @@ unlike( - "with terse_error, does not include the source code" - ); - --done_testing; -+#done_testing; -Index: Eval-Closure-0.05/t/11-debugger.t -=================================================================== ---- Eval-Closure-0.05.orig/t/11-debugger.t -+++ Eval-Closure-0.05/t/11-debugger.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use strict; - use warnings; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - - BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE -@@ -20,4 +20,4 @@ unlike( - ); - - --done_testing; -+#done_testing; diff --git a/perl-Eval-Closure.changes b/perl-Eval-Closure.changes index c87a7a6..0f773ac 100644 --- a/perl-Eval-Closure.changes +++ b/perl-Eval-Closure.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 21 14:12:01 UTC 2013 - lars@linux-schulserver.de + +- remove perl-Eval-Closure-old_Test-More.patch - handle the problem + with old distributions in %%prep now + ------------------------------------------------------------------- Tue May 29 14:39:41 UTC 2012 - coolo@suse.com diff --git a/perl-Eval-Closure.spec b/perl-Eval-Closure.spec index 34c5a22..e4b1546 100644 --- a/perl-Eval-Closure.spec +++ b/perl-Eval-Closure.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Eval-Closure # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,6 @@ License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Eval-Closure/ Source: http://www.cpan.org/authors/id/D/DO/DOY/%{cpan_name}-%{version}.tar.gz -Patch1: perl-Eval-Closure-old_Test-More.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -60,7 +59,10 @@ non-existent) if caching is to work properly). %prep %setup -q -n %{cpan_name}-%{version} %if 0%{?suse_version} < 1210 -%patch1 -p1 +mv t/00-compile.t t/00-compile.t.disable +sed -i "s|^use Test::More;|use Test::More qw(no_plan);|g; \ + s|^done_testing;|#done_testing;|g" t/*.t +mv t/00-compile.t.disable t/00-compile.t %endif %build