commit 0e2038f2f5976ede4e2c7cc549d96b7e24607827
Author: Jitka Plesnikova <jplesnik@xxxxxxxxxx>
Date: Fri Feb 13 17:13:18 2015 +0100
4.13 bump
.gitignore | 1 +
CGI-4.04-Make-Test-Deep-tests-optional.patch | 39 --------
...t-Deep-and-Test-NoWarnings-tests-optional.patch | 100 ++++++++++++++++++++
perl-CGI.spec | 24 ++++-
sources | 2 +-
5 files changed, 121 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32b7dd9..e860440 100644
--- 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
diff --git 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
new file mode 100644
index 0000000..83348e0
--- /dev/null
+++ 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'
+ );
++ }
+ }
+
diff --git a/perl-CGI.spec b/perl-CGI.spec
index c5207f7..27dcd05 100644
--- 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@xxxxxxxxxx> - 4.13-1
+- 4.13 bump
+- Make Test::NoWarnings tests optional
+
* Wed Dec 10 2014 Petr Pisar <ppisar@xxxxxxxxxx> - 4.04-2
- Make Test::Deep tests optional as it's not in the core in contrast to the CGI
diff --git a/sources b/sources
index 77bd6d4..399ae4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ce0be2fd863b6c794997d609b22e72f CGI-4.04.tar.gz
+1de46434384fc0e59da6b6b407130c20 CGI-4.13.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
