diff --git a/perl-namespace-clean-use_lib.patch b/perl-namespace-clean-use_lib.patch deleted file mode 100644 index abc56b7..0000000 --- a/perl-namespace-clean-use_lib.patch +++ /dev/null @@ -1,97 +0,0 @@ -Index: namespace-clean-0.20/Makefile.PL -================================================================================ ---- namespace-clean-0.22/t/00-basic.t -+++ namespace-clean-0.22/t/00-basic.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use warnings; - use strict; -- -+use lib '__vendorperl__'; - use FindBin; - use lib "$FindBin::Bin/lib"; - use Test::More tests => 4; ---- namespace-clean-0.22/t/01-function-wipeout.t -+++ namespace-clean-0.22/t/01-function-wipeout.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use warnings; - use strict; -- -+use lib '__vendorperl__'; - use FindBin; - use lib "$FindBin::Bin/lib"; - use Test::More tests => 9; ---- namespace-clean-0.22/t/02-inheritance.t -+++ namespace-clean-0.22/t/02-inheritance.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use warnings; - use strict; -- -+use lib '__vendorperl__'; - use FindBin; - use lib "$FindBin::Bin/lib"; - use Test::More tests => 10; ---- namespace-clean-0.22/t/03-unimport.t -+++ namespace-clean-0.22/t/03-unimport.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use warnings; - use strict; -- -+use lib '__vendorperl__'; - use FindBin; - use lib "$FindBin::Bin/lib"; - use Test::More tests => 6; ---- namespace-clean-0.22/t/04-except.t -+++ namespace-clean-0.22/t/04-except.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use warnings; - use strict; -- -+use lib '__vendorperl__'; - use FindBin; - use lib "$FindBin::Bin/lib"; - use Test::More tests => 6; ---- namespace-clean-0.22/t/06-other-types.t -+++ namespace-clean-0.22/t/06-other-types.t -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl - use warnings; - use strict; -- -+use lib '__vendorperl__'; - use FindBin; - use lib "$FindBin::Bin/lib"; - use Test::More tests => 17; ---- namespace-clean-0.22/t/08-const-sub.t -+++ namespace-clean-0.22/t/08-const-sub.t -@@ -1,6 +1,6 @@ - use strict; - use warnings; -- -+use lib '__vendorperl__'; - use Test::More 0.88; - - use constant CONST => 123; ---- namespace-clean-0.22/t/09-fiddle-hinthash.t -+++ namespace-clean-0.22/t/09-fiddle-hinthash.t -@@ -1,6 +1,7 @@ - use strict; - use warnings; - -+use lib '__vendorperl__'; - use Test::More 0.88; - - { ---- namespace-clean-0.22/t/10-pure-perl.t -+++ namespace-clean-0.22/t/10-pure-perl.t -@@ -1,5 +1,6 @@ - use strict; - use warnings; -+use lib '__vendorperl__'; - use Test::More; - - plan skip_all => "PP tests already executed" diff --git a/perl-namespace-clean.changes b/perl-namespace-clean.changes index f288e19..8bd7164 100644 --- a/perl-namespace-clean.changes +++ b/perl-namespace-clean.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 2 01:01:37 CET 2012 - ro@suse.de + +- remove perl-namespace-clean-use_lib.patch and use sed statement + instead (less likely to break with every package update) + ------------------------------------------------------------------- Thu Mar 1 01:27:28 CET 2012 - ro@suse.de diff --git a/perl-namespace-clean.spec b/perl-namespace-clean.spec index 16a367a..315c28b 100644 --- a/perl-namespace-clean.spec +++ b/perl-namespace-clean.spec @@ -25,8 +25,6 @@ License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/namespace-clean/ Source: http://www.cpan.org/authors/id/R/RI/RIBASUSHI/%{cpan_name}-%{version}.tar.gz -# MANUAL -Patch1: perl-namespace-clean-use_lib.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -58,8 +56,9 @@ Keep imports and functions out of your namespace %prep %setup -q -n %{cpan_name}-%{version} %if 0%{?suse_version} <= 1110 -%patch1 -p1 -sed -i "s|__vendorperl__|%{perl_vendorlib}|g" Makefile.PL t/*.t +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 # fail due to missing Sub/Name.pm rm -f t/07-debugger.t rm -f t/10-pure-perl.t