diff --git a/.gitignore b/.gitignore index f490cfa..99c9dd9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /CGI-4.24.tar.gz /CGI-4.25.tar.gz /CGI-4.26.tar.gz +/CGI-4.27.tar.gz diff --git a/CGI-4.24-Make-Test-Deep-and-Test-NoWarnings-tests-optional.patch b/CGI-4.27-Make-Test-Deep-tests-optional.patch similarity index 68% rename from CGI-4.24-Make-Test-Deep-and-Test-NoWarnings-tests-optional.patch rename to CGI-4.27-Make-Test-Deep-tests-optional.patch index 97037df..e00375f 100644 --- a/CGI-4.24-Make-Test-Deep-and-Test-NoWarnings-tests-optional.patch +++ b/CGI-4.27-Make-Test-Deep-tests-optional.patch @@ -1,15 +1,15 @@ -diff -up CGI-4.15/t/cgi.t.orig CGI-4.15/t/cgi.t ---- CGI-4.15/t/cgi.t.orig 2015-04-20 15:31:49.680912958 +0200 -+++ CGI-4.15/t/cgi.t 2015-04-20 15:33:59.394460113 +0200 +diff -up CGI-4.27/t/cgi.t.orig CGI-4.27/t/cgi.t +--- CGI-4.27/t/cgi.t.orig 2016-03-02 08:43:05.000000000 +0100 ++++ CGI-4.27/t/cgi.t 2016-03-02 15:52:50.825729857 +0100 @@ -6,7 +6,6 @@ use strict; use warnings; use Test::More tests => 25; -use Test::Deep; - use Test::Warn; use CGI (); -@@ -28,11 +27,15 @@ is( $q->PrintHeader,$q->header,'PrintHea + +@@ -27,11 +26,15 @@ is( $q->PrintHeader,$q->header,'PrintHea is( $q->HtmlTop,$q->start_html,'HtmlTop' ); is( $q->HtmlBot,$q->end_html,'HtmlBot' ); @@ -27,7 +27,7 @@ diff -up CGI-4.15/t/cgi.t.orig CGI-4.15/t/cgi.t ok( $q->MethGet,'MethGet' ); ok( ! $q->MethPost,'MethPost' ); -@@ -61,13 +64,17 @@ $CGI::CLOSE_UPLOAD_FILES = 0; +@@ -60,13 +63,17 @@ $CGI::CLOSE_UPLOAD_FILES = 0; ok( $q->close_upload_files( 1 ),'close_upload_files' ); is( $CGI::CLOSE_UPLOAD_FILES,1,' ... sets $CGI::CLOSE_UPLOAD_FILES' ); @@ -47,19 +47,19 @@ diff -up CGI-4.15/t/cgi.t.orig CGI-4.15/t/cgi.t +} ok( ! $q->private_tempfiles,'private_tempfiles' ); -diff -up CGI-4.15/t/param_list_context.t.orig CGI-4.15/t/param_list_context.t ---- CGI-4.15/t/param_list_context.t.orig 2015-04-16 11:07:47.000000000 +0200 -+++ CGI-4.15/t/param_list_context.t 2015-04-20 14:55:08.907630027 +0200 +diff -up CGI-4.27/t/param_list_context.t.orig CGI-4.27/t/param_list_context.t +--- CGI-4.27/t/param_list_context.t.orig 2016-03-02 08:48:20.000000000 +0100 ++++ CGI-4.27/t/param_list_context.t 2016-03-02 15:52:50.825729857 +0100 @@ -4,7 +4,7 @@ use strict; use warnings; - use Test::More tests => 8; + use Test::More; -use Test::Deep; + use Test::Warn; use CGI (); -@@ -36,11 +36,15 @@ warnings_are +@@ -43,11 +43,15 @@ warnings_are " ... but we only warn once", ; @@ -77,7 +77,7 @@ diff -up CGI-4.15/t/param_list_context.t.orig CGI-4.15/t/param_list_context.t warnings_are { @params = $q->multi_param('game') } -@@ -48,11 +52,15 @@ warnings_are +@@ -55,11 +59,15 @@ warnings_are "no warnings calling multi_param" ; @@ -95,32 +95,31 @@ diff -up CGI-4.15/t/param_list_context.t.orig CGI-4.15/t/param_list_context.t $CGI::LIST_CONTEXT_WARN = 0; -diff -up CGI-4.15/t/request.t.orig CGI-4.15/t/request.t ---- CGI-4.15/t/request.t.orig 2015-04-16 11:07:47.000000000 +0200 -+++ CGI-4.15/t/request.t 2015-04-20 14:55:08.907630027 +0200 -@@ -4,8 +4,6 @@ use strict; +diff -up CGI-4.27/t/request.t.orig CGI-4.27/t/request.t +--- CGI-4.27/t/request.t.orig 2016-03-02 08:16:46.000000000 +0100 ++++ CGI-4.27/t/request.t 2016-03-02 15:52:50.825729857 +0100 +@@ -4,7 +4,6 @@ use strict; use warnings; - use Test::More tests => 45; + use Test::More tests => 44; -use Test::Deep; --use Test::NoWarnings; use CGI (); use Config; -@@ -118,7 +116,9 @@ $q->_reset_globals; +@@ -117,7 +116,9 @@ $q->_reset_globals; is_deeply [ sort $q->$_( 'keywords' ) ], [ qw/ dragon tiger / ], "$_ keywords" for qw/ param url_param /; - { + SKIP: { + skip 'Test::Deep module is not available', 3 unless -+ (eval 'use Test::Deep 0.11; 1' && eval 'use Test::NoWarnings; 1'); ++ (eval 'use Test::Deep 0.11; 1'); $^W++; CGI::_reset_globals; -diff -up CGI-4.15/t/util.t.orig CGI-4.15/t/util.t ---- CGI-4.15/t/util.t.orig 2015-04-17 15:22:23.000000000 +0200 -+++ CGI-4.15/t/util.t 2015-04-20 14:55:08.908630038 +0200 +diff -up CGI-4.27/t/util.t.orig CGI-4.27/t/util.t +--- CGI-4.27/t/util.t.orig 2015-12-15 18:12:19.000000000 +0100 ++++ CGI-4.27/t/util.t 2016-03-02 15:52:50.825729857 +0100 @@ -6,7 +6,6 @@ $| = 1; diff --git a/perl-CGI.spec b/perl-CGI.spec index 7c5d848..198e708 100644 --- a/perl-CGI.spec +++ b/perl-CGI.spec @@ -1,16 +1,17 @@ Name: perl-CGI Summary: Handle Common Gateway Interface requests and responses -Version: 4.26 +Version: 4.27 Release: 1%{?dist} License: (GPL+ or Artistic) and Artistic 2.0 Group: Development/Libraries Source0: http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-%{version}.tar.gz -# Make Test::Deep and Test::NoWarnings tests optional as it's not in the core in contrast to the CGI -Patch0: CGI-4.24-Make-Test-Deep-and-Test-NoWarnings-tests-optional.patch +# Make Test::Deep tests optional as it's not in the core in contrast to the CGI +Patch0: CGI-4.27-Make-Test-Deep-tests-optional.patch URL: http://search.cpan.org/dist/CGI BuildArch: noarch BuildRequires: coreutils BuildRequires: findutils +BuildRequires: glibc-common BuildRequires: make BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) @@ -51,7 +52,6 @@ BuildRequires: perl(utf8) # Optional tests BuildRequires: perl(Test::CPAN::Changes) BuildRequires: perl(Test::Deep) >= 0.11 -BuildRequires: perl(Test::NoWarnings) %endif Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %if 0%(perl -e 'print $] >= 5.019') @@ -106,6 +106,9 @@ make test %{_mandir}/man3/*.3* %changelog +* Wed Mar 02 2016 Jitka Plesnikova - 4.27-1 +- 4.27 bump + * Mon Feb 08 2016 Jitka Plesnikova - 4.26-1 - 4.26 bump diff --git a/sources b/sources index b6ade97..2892cc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf606eda81c9dc5347c1f3483732b2d2 CGI-4.26.tar.gz +494f4a891a710adbb6cf75279ef5da4e CGI-4.27.tar.gz