From e7cb60f9ee0b517e567094b7e029aa6fea74b18a0344e238cbe4e9651e5e5e81 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 5 Jun 2011 01:10:49 +0000 Subject: [PATCH] - fix build on distributions with old Test::More module ( perl-Catalyst-Plugin-Authentication-use_lib.patch ) OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Catalyst-Plugin-Authentication?expand=0&rev=3 --- ...talyst-Plugin-Authentication-use_lib.patch | 56 +++++++++++++++++++ perl-Catalyst-Plugin-Authentication.changes | 6 ++ perl-Catalyst-Plugin-Authentication.spec | 6 ++ 3 files changed, 68 insertions(+) create mode 100644 perl-Catalyst-Plugin-Authentication-use_lib.patch diff --git a/perl-Catalyst-Plugin-Authentication-use_lib.patch b/perl-Catalyst-Plugin-Authentication-use_lib.patch new file mode 100644 index 0000000..4c5eeb3 --- /dev/null +++ b/perl-Catalyst-Plugin-Authentication-use_lib.patch @@ -0,0 +1,56 @@ +Index: Catalyst-Plugin-Authentication-0.10017/t/06_user.t +=================================================================== +--- Catalyst-Plugin-Authentication-0.10017.orig/t/06_user.t ++++ Catalyst-Plugin-Authentication-0.10017/t/06_user.t +@@ -1,6 +1,6 @@ + use strict; + use warnings; +- ++use lib '__vendorperl__'; + use Test::More; + use Test::Exception; + +Index: Catalyst-Plugin-Authentication-0.10017/t/live_app_realms_progressive.t +=================================================================== +--- Catalyst-Plugin-Authentication-0.10017.orig/t/live_app_realms_progressive.t ++++ Catalyst-Plugin-Authentication-0.10017/t/live_app_realms_progressive.t +@@ -1,6 +1,6 @@ + use strict; + use warnings; +- ++use lib '__vendorperl__'; + use Test::More; + + use lib 't/lib'; +Index: Catalyst-Plugin-Authentication-0.10017/t/live_app_remote1.t +=================================================================== +--- Catalyst-Plugin-Authentication-0.10017.orig/t/live_app_remote1.t ++++ Catalyst-Plugin-Authentication-0.10017/t/live_app_remote1.t +@@ -1,5 +1,6 @@ + use strict; + use warnings; ++use lib '__vendorperl__'; + use Test::More; + + use lib 't/lib'; +Index: Catalyst-Plugin-Authentication-0.10017/t/live_app_remote2.t +=================================================================== +--- Catalyst-Plugin-Authentication-0.10017.orig/t/live_app_remote2.t ++++ Catalyst-Plugin-Authentication-0.10017/t/live_app_remote2.t +@@ -1,5 +1,6 @@ + use strict; + use warnings; ++use lib '__vendorperl__'; + use Test::More; + + use lib 't/lib'; +Index: Catalyst-Plugin-Authentication-0.10017/Makefile.PL +=================================================================== +--- Catalyst-Plugin-Authentication-0.10017.orig/Makefile.PL ++++ Catalyst-Plugin-Authentication-0.10017/Makefile.PL +@@ -1,4 +1,5 @@ + use inc::Module::Install 0.87; ++use lib '__vendorperl__'; + + if ( $Module::Install::AUTHOR ) { + system( 'pod2text lib/Catalyst/Plugin/Authentication.pm > README' ) diff --git a/perl-Catalyst-Plugin-Authentication.changes b/perl-Catalyst-Plugin-Authentication.changes index 9d36e4c..9c6d97f 100644 --- a/perl-Catalyst-Plugin-Authentication.changes +++ b/perl-Catalyst-Plugin-Authentication.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 5 01:10:28 UTC 2011 - lars@linux-schulserver.de + +- fix build on distributions with old Test::More module + ( perl-Catalyst-Plugin-Authentication-use_lib.patch ) + ------------------------------------------------------------------- Mon Apr 4 08:29:01 UTC 2011 - coolo@novell.com diff --git a/perl-Catalyst-Plugin-Authentication.spec b/perl-Catalyst-Plugin-Authentication.spec index 36f8254..5f120a6 100644 --- a/perl-Catalyst-Plugin-Authentication.spec +++ b/perl-Catalyst-Plugin-Authentication.spec @@ -25,6 +25,7 @@ Url: http://search.cpan.org/dist/Catalyst-Plugin-Authentication/ Group: Development/Libraries/Perl #Source: http://www.cpan.org/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.gz +Patch1: perl-Catalyst-Plugin-Authentication-use_lib.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -36,6 +37,7 @@ BuildRequires: perl(Class::MOP) BuildRequires: perl(Moose) BuildRequires: perl(MRO::Compat) BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::More) >= 0.88 Requires: perl(Catalyst::Plugin::Session) >= 0.10 Requires: perl(Catalyst::Runtime) Requires: perl(Class::Inspector) @@ -70,6 +72,10 @@ information. %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 +%endif %build %{__perl} Makefile.PL INSTALLDIRS=vendor