From 3715e62b98f13f691b1287770303594d13645242d7ca112aed66fb7040ca1893 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 16 Mar 2012 08:17:23 +0000 Subject: [PATCH] - remove old_test_more patch and use sed statement instead (less likely to break with every package update) OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-B-Hooks-EndOfScope?expand=0&rev=15 --- old_test_more.patch | 28 ---------------------------- perl-B-Hooks-EndOfScope.changes | 6 ++++++ perl-B-Hooks-EndOfScope.spec | 9 ++++----- 3 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 old_test_more.patch diff --git a/old_test_more.patch b/old_test_more.patch deleted file mode 100644 index e8d84dc..0000000 --- a/old_test_more.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.PL -+++ Makefile.PL -@@ -12,7 +12,7 @@ - "ABSTRACT" => "Execute code after a scope finished compilation", - "AUTHOR" => "Florian Ragwitz ", - "BUILD_REQUIRES" => { -- "Test::More" => "0.89" -+ "Test::More" => "0.01" - }, - "CONFIGURE_REQUIRES" => { - "ExtUtils::MakeMaker" => "6.30" ---- t/localise.t -+++ t/localise.t -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.89; -+use Test::More qw(no_plan); - - use B::Hooks::EndOfScope; - -@@ -47,4 +47,4 @@ - BEGIN { ok($fired) } - } - --done_testing; -+#done_testing; diff --git a/perl-B-Hooks-EndOfScope.changes b/perl-B-Hooks-EndOfScope.changes index 3b9579d..1fd8b1c 100644 --- a/perl-B-Hooks-EndOfScope.changes +++ b/perl-B-Hooks-EndOfScope.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 16 08:15:44 UTC 2012 - lars@linux-schulserver.de + +- remove old_test_more patch and use sed statement + instead (less likely to break with every package update) + ------------------------------------------------------------------- Wed Feb 29 18:13:24 CET 2012 - ro@suse.de diff --git a/perl-B-Hooks-EndOfScope.spec b/perl-B-Hooks-EndOfScope.spec index 33399aa..0824e94 100644 --- a/perl-B-Hooks-EndOfScope.spec +++ b/perl-B-Hooks-EndOfScope.spec @@ -19,15 +19,12 @@ Name: perl-B-Hooks-EndOfScope Version: 0.11 Release: 0 -%define cpan_name B-Hooks-EndOfScope +%define cpan_name B-Hooks-EndOfScope Summary: Execute code after a scope finished compilation License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/B-Hooks-EndOfScope/ Source: http://www.cpan.org/authors/id/F/FL/FLORA/%{cpan_name}-%{version}.tar.gz -%if 0%{?suse_version} <= 1110 -Patch0: old_test_more.patch -%endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -51,7 +48,9 @@ surrounding scope. %{__perl} -p -i -e 's|6.31|6.30|' Makefile.PL %endif %if 0%{?suse_version} <= 1110 -%patch0 +for i in `find t -type f` ; do + sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i +done %endif # MANUAL END