From ad15ff17f199846f062996e2ffa073e3d8a7504c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 4 Jan 2023 13:46:57 +0100 Subject: [PATCH] 4.55 bump --- .gitignore | 1 + CGI-4.28-Make-Test-Deep-tests-optional.patch | 149 ------------------- perl-CGI.spec | 8 +- sources | 2 +- 4 files changed, 7 insertions(+), 153 deletions(-) delete mode 100644 CGI-4.28-Make-Test-Deep-tests-optional.patch diff --git a/.gitignore b/.gitignore index fbf7eef..eced14d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /CGI-4.52.tar.gz /CGI-4.53.tar.gz /CGI-4.54.tar.gz +/CGI-4.55.tar.gz diff --git a/CGI-4.28-Make-Test-Deep-tests-optional.patch b/CGI-4.28-Make-Test-Deep-tests-optional.patch deleted file mode 100644 index e72ca86..0000000 --- a/CGI-4.28-Make-Test-Deep-tests-optional.patch +++ /dev/null @@ -1,149 +0,0 @@ -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 CGI (); - -@@ -27,11 +26,15 @@ is( $q->PrintHeader,$q->header,'PrintHea - is( $q->HtmlTop,$q->start_html,'HtmlTop' ); - is( $q->HtmlBot,$q->end_html,'HtmlBot' ); - --cmp_deeply( -+SKIP: { -+ skip 'Test::Deep module is not available', 1 unless -+ eval 'use Test::Deep 0.11; 1'; -+ cmp_deeply( - [ my @params = CGI::SplitParam( "foo\0bar" ) ], - [ qw/ foo bar /], - 'SplitParam' --); -+ ); -+} - - ok( $q->MethGet,'MethGet' ); - ok( ! $q->MethPost,'MethPost' ); -@@ -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' ); - --cmp_deeply( -+SKIP: { -+ skip 'Test::Deep module is not available', 1 unless -+ eval 'use Test::Deep 0.11; 1'; -+ cmp_deeply( - $q->default_dtd, - [ - '-//W3C//DTD HTML 4.01 Transitional//EN', - 'http://www.w3.org/TR/html4/loose.dtd' - ], - 'default_dtd' --); -+ ); -+} - - ok( ! $q->private_tempfiles,'private_tempfiles' ); -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; --use Test::Deep; -+ - use Test::Warn; - - use CGI (); -@@ -43,11 +43,15 @@ warnings_are - " ... but we only warn once", - ; - --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') } -@@ -55,11 +59,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.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 => 71; --use Test::Deep; - - use CGI (); - use Config; -@@ -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', 2 unless -+ (eval 'use Test::Deep 0.11; 1'); - $^W++; - - CGI::_reset_globals; -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; - - use Test::More tests => 80; --use Test::Deep; - use Config; - use_ok ( 'CGI::Util', qw( - escape -@@ -68,6 +67,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 ], - [ -@@ -83,6 +86,7 @@ for ( 1 .. 20 ) { - ], - 'rearrange not sensitive to hash key ordering' - ); -+ } - } - - ok( CGI::Util::utf8_chr( "1",1 ),'utf8_chr' ); diff --git a/perl-CGI.spec b/perl-CGI.spec index a5989b4..655d803 100644 --- a/perl-CGI.spec +++ b/perl-CGI.spec @@ -3,8 +3,8 @@ Name: perl-CGI Summary: Handle Common Gateway Interface requests and responses -Version: 4.54 -Release: 4%{?dist} +Version: 4.55 +Release: 1%{?dist} License: Artistic-2.0 Source0: https://cpan.metacpan.org/authors/id/L/LE/LEEJO/CGI-%{version}.tar.gz URL: https://metacpan.org/release/CGI @@ -40,7 +40,6 @@ BuildRequires: perl(IO::File) BuildRequires: perl(IO::Handle) BuildRequires: perl(lib) BuildRequires: perl(POSIX) -BuildRequires: perl(Test::Deep) >= 0.11 BuildRequires: perl(Test::More) >= 0.98 BuildRequires: perl(Test::Warn) >= 0.3 BuildRequires: perl(utf8) @@ -131,6 +130,9 @@ make test %{_libexecdir}/%{name} %changelog +* Wed Jan 04 2023 Jitka Plesnikova - 4.55-1 +- 4.55 bump + * Fri Jul 22 2022 Fedora Release Engineering - 4.54-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 7f6d707..4a961bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (CGI-4.54.tar.gz) = be7ecdd9eab81ad95d527aac2f10ef7a15322675fe002558c6ab4951f496a8964025b7d0426241fb3f61aba103964a40f99acc05a39c84a2434f70d90ac47be6 +SHA512 (CGI-4.55.tar.gz) = 6dbe99669953ef09431f7419f1d5b3de267fa149fa15d6b428a992d0a1283579557d32aff2451242235fe0c815d4238c070176a81f51724864708f6276953129