4.13 bump

2015-02-13 17:13:18 +01:00 · 2015-02-13 17:13:18 +01:00 · 4e46f2b642
commit 4e46f2b642
parent 376f226b8f
5 changed files with 121 additions and 45 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,3 +11,4 @@
 /CGI.pm-4.02.tar.gz
 /CGI.pm-4.03.tar.gz
 /CGI-4.04.tar.gz
+/CGI-4.13.tar.gz
--- a/CGI-4.04-Make-Test-Deep-tests-optional.patch
+++ b/CGI-4.04-Make-Test-Deep-tests-optional.patch
@ -1,39 +0,0 @@
-From 5d80235ee0c4faf77ba0dbb77c879200026d6b3d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Wed, 10 Dec 2014 14:24:17 +0100
-Subject: [PATCH] Make Test::Deep tests optional
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
---
- t/request.t | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/t/request.t b/t/request.t
-index f03fe02..a6d211d 100644
--- a/t/request.t
-+++ b/t/request.t
-@@ -4,7 +4,6 @@ use strict;
- use warnings;
- 
- use Test::More tests => 44;
-use Test::Deep;
- 
- use CGI ();
- use Config;
-@@ -115,7 +114,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', 2 unless
-+		    eval 'use Test::Deep 0.11; 1';
- 		# RT #54511. TODO: use Test::Warn / Test::Warnings / Test::NoWarnings
- 		$^W++;
- 		local $SIG{__WARN__} = sub { fail( "Got a warning: " . $_[0] ); };
-- 
-1.9.3
-
--- a/CGI-4.13-Make-Test-Deep-and-Test-NoWarnings-tests-optional.patch
+++ b/CGI-4.13-Make-Test-Deep-and-Test-NoWarnings-tests-optional.patch
@ -0,0 +1,100 @@
+diff -up CGI-4.13/t/param_list_context.t.orig CGI-4.13/t/param_list_context.t
+--- CGI-4.13/t/param_list_context.t.orig	2015-02-13 14:29:41.074521085 +0100
+++ CGI-4.13/t/param_list_context.t	2015-02-13 15:11:32.430400441 +0100
+@@ -4,7 +4,7 @@ use strict;
+ use warnings;
+ 
+ use Test::More tests => 7;
+-use Test::Deep;
+
+ use Test::Warn;
+ 
+ use CGI ();
+@@ -30,11 +30,15 @@ warning_like
+     "calling ->param with args in list context warns"
+ ;
+ 
+-cmp_deeply(
+SKIP: {
+    skip 'Test::Deep module is not available', 1 unless
+        eval 'use Test::Deep 0.11; 1';
+    cmp_deeply(
+ 	[ sort @params ],
+ 	[ qw/ checkers chess / ],
+ 	'CGI::param()',
+-);
+    );
+}
+ 
+ warnings_are
+ 	{ @params = $q->multi_param('game') }
+@@ -42,11 +46,15 @@ warnings_are
+ 	"no warnings calling multi_param"
+ ;
+ 
+-cmp_deeply(
+SKIP: {
+    skip 'Test::Deep module is not available', 1 unless
+        eval 'use Test::Deep 0.11; 1';
+    cmp_deeply(
+ 	[ sort @params ],
+ 	[ qw/ checkers chess / ],
+ 	'CGI::multi_param'
+-);
+    );
+}
+ 
+ $CGI::LIST_CONTEXT_WARN = 0;
+ 
+diff -up CGI-4.13/t/request.t.orig CGI-4.13/t/request.t
+--- CGI-4.13/t/request.t.orig	2014-12-01 10:11:15.000000000 +0100
+++ CGI-4.13/t/request.t	2015-02-13 16:16:56.594560316 +0100
+@@ -4,8 +4,6 @@ use strict;
+ use warnings;
+ 
+ use Test::More tests => 45;
+-use Test::Deep;
+-use Test::NoWarnings;
+ 
+ use CGI ();
+ use Config;
+@@ -118,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');
+ 		$^W++;
+ 
+ 		CGI::_reset_globals;
+diff -up CGI-4.13/t/util.t.orig CGI-4.13/t/util.t
+--- CGI-4.13/t/util.t.orig	2015-02-13 14:22:19.296463091 +0100
+++ CGI-4.13/t/util.t	2015-02-13 14:28:16.804556263 +0100
+@@ -6,7 +6,6 @@
+ $| = 1;
+ 
+ use Test::More tests => 77;
+-use Test::Deep;
+ use Config;
+ use_ok ( 'CGI::Util', qw(escape unescape rearrange) );
+ 
+@@ -62,6 +61,10 @@ for ( 1 .. 20 ) {
+ 		%args,
+ 	);
+ 
+    SKIP: {
+	skip 'Test::Deep module is not available', 1 unless
+	    eval 'use Test::Deep 0.11; 1';
+
+ 	cmp_deeply(
+ 		[ @ordered ],
+ 		[
+@@ -77,5 +80,6 @@ for ( 1 .. 20 ) {
+ 		],
+ 		'rearrange not sensitive to hash key ordering'
+ 	);
+    }
+ }
+ 
--- a/perl-CGI.spec
+++ b/perl-CGI.spec
@ -1,12 +1,12 @@
 Name:           perl-CGI
 Summary:        Handle Common Gateway Interface requests and responses
-Version:        4.04
-Release:        2%{?dist}
+Version:        4.13
+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 tests optional as it's not in the core in contrast to the CGI
-Patch0:         CGI-4.04-Make-Test-Deep-tests-optional.patch
+# Make Test::Deep and Test::NoWarnings tests optional as it's not in the core in contrast to the CGI
+Patch0:         CGI-4.13-Make-Test-Deep-and-Test-NoWarnings-tests-optional.patch
 URL:            http://search.cpan.org/dist/CGI
 BuildArch:      noarch
 BuildRequires:  perl
@ -20,8 +20,11 @@ BuildRequires:  perl(deprecate)
 %endif
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(File::Spec) >= 0.82
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(HTML::Entities)
 BuildRequires:  perl(if)
 BuildRequires:  perl(overload)
+BuildRequires:  perl(parent)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(vars)
 BuildRequires:  perl(warnings)
@ -29,15 +32,20 @@ BuildRequires:  perl(warnings)
 # Tests:
 BuildRequires:  perl(Config)
 BuildRequires:  perl(Encode)
+BuildRequires:  perl(File::Find)
 BuildRequires:  perl(FileHandle)
+BuildRequires:  perl(FindBin)
 BuildRequires:  perl(IO::File)
 BuildRequires:  perl(IO::Handle)
 BuildRequires:  perl(lib)
+BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Test::More) >= 0.98
+BuildRequires:  perl(Test::Warn)
 BuildRequires:  perl(utf8)
 %if !%{defined perl_bootstrap}
 # Optional tests
 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')
@ -48,8 +56,10 @@ Requires:       perl(File::Spec) >= 0.82
 %{?perl_default_filter}
 # Remove under-specified dependencies
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((File::Spec)\\)$
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((Fh)\\)
 # Remove false provides
-%global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\((Fh|MultipartBuffer)\\)$
+%global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(MultipartBuffer\\)$
+%global __provides_exclude %{?__provides_exclude:__provides_exclude|}^perl\\(Fh\\)

 %description
 CGI.pm is a stable, complete and mature solution for processing and preparing
@ -86,6 +96,10 @@ make test
 %{_mandir}/man3/*.3*

 %changelog
+* Fri Feb 13 2015 Jitka Plesnikova <jplesnik@redhat.com> - 4.13-1
+- 4.13 bump
+- Make Test::NoWarnings tests optional
+
 * Wed Dec 10 2014 Petr Pisar <ppisar@redhat.com> - 4.04-2
 - Make Test::Deep tests optional as it's not in the core in contrast to the CGI

--- a/2
+++ b/2
@ -1 +1 @@
-1ce0be2fd863b6c794997d609b22e72f  CGI-4.04.tar.gz
+1de46434384fc0e59da6b6b407130c20  CGI-4.13.tar.gz