From 81878c7f4765beab2d7f84dda76da2638098636e Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 16 May 2023 13:34:39 +0200 Subject: [PATCH] Upgrade to 1.54 as provided in perl-5.37.11 --- Carp-1.52-Upgrade-to-1.54.patch | 77 +++++++++++++++++++++++++++++++++ perl-Carp.spec | 13 ++++-- 2 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 Carp-1.52-Upgrade-to-1.54.patch diff --git a/Carp-1.52-Upgrade-to-1.54.patch b/Carp-1.52-Upgrade-to-1.54.patch new file mode 100644 index 0000000..a13b617 --- /dev/null +++ b/Carp-1.52-Upgrade-to-1.54.patch @@ -0,0 +1,77 @@ +From 7b5bfc02532e5a275fadc43beb1d7f9a0ef3fdb8 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Tue, 16 May 2023 12:41:10 +0200 +Subject: [PATCH] Upgrade to 1.54 + +--- + lib/Carp.pm | 12 ++++++------ + lib/Carp/Heavy.pm | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/Carp.pm b/lib/Carp.pm +index df563d0..20b9708 100644 +--- a/lib/Carp.pm ++++ b/lib/Carp.pm +@@ -179,7 +179,7 @@ BEGIN { + ? do { require "overload.pm"; _fetch_sub overload => 'mycan' } + : \&UNIVERSAL::can; + +- # _blessed is either UNIVERAL::isa(...), or, in the presence of an ++ # _blessed is either UNIVERSAL::isa(...), or, in the presence of an + # override, a hideous, but fairly reliable, workaround. + *_blessed = $isa + ? sub { &$isa($_[0], "UNIVERSAL") } +@@ -211,7 +211,7 @@ BEGIN { + } + + +-our $VERSION = '1.52'; ++our $VERSION = '1.54'; + $VERSION =~ tr/_//d; + + our $MaxEvalLen = 0; +@@ -776,8 +776,8 @@ Carp - alternative warn and die for modules + # cluck, longmess and shortmess not exported by default + use Carp qw(cluck longmess shortmess); + cluck "This is how we got here!"; # warn with stack backtrace +- $long_message = longmess( "message from cluck() or confess()" ); +- $short_message = shortmess( "message from carp() or croak()" ); ++ my $long_message = longmess( "message from cluck() or confess()" ); ++ my $short_message = shortmess( "message from carp() or croak()" ); + + =head1 DESCRIPTION + +@@ -802,7 +802,7 @@ Of course, C can't guarantee the latter. + + You can also alter the way the output and logic of C works, by + changing some global variables in the C namespace. See the +-section on C below. ++section on L below. + + Here is a more complete description of how C and C work. + What they do is search the call-stack for a function call stack where +@@ -868,7 +868,7 @@ or by including the string C<-MCarp=verbose> in the PERL5OPT + environment variable. + + Alternately, you can set the global variable C<$Carp::Verbose> to true. +-See the C section below. ++See the L section below. + + =head2 Stack Trace formatting + +diff --git a/lib/Carp/Heavy.pm b/lib/Carp/Heavy.pm +index fdb3e52..043e345 100644 +--- a/lib/Carp/Heavy.pm ++++ b/lib/Carp/Heavy.pm +@@ -2,7 +2,7 @@ package Carp::Heavy; + + use Carp (); + +-our $VERSION = '1.52'; ++our $VERSION = '1.54'; + $VERSION =~ tr/_//d; + + # Carp::Heavy was merged into Carp in version 1.12. Any mismatched versions +-- +2.40.1 + diff --git a/perl-Carp.spec b/perl-Carp.spec index d2dd0b3..82fae3f 100644 --- a/perl-Carp.spec +++ b/perl-Carp.spec @@ -1,14 +1,17 @@ %global base_version 1.50 Name: perl-Carp -Version: 1.52 -Release: 490%{?dist} +Version: 1.54 +Release: 1%{?dist} Summary: Alternative warn and die for modules License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Carp Source0: https://cpan.metacpan.org/authors/id/X/XS/XSAWYERX/Carp-%{base_version}.tar.gz # Unbundled from perl 5.34.0 Patch0: Carp-1.50-Upgrade-to-1.52.patch +# Unbundled from perl 5.37.11 +Patch1: Carp-1.52-Upgrade-to-1.54.patch BuildArch: noarch +BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter @@ -53,7 +56,8 @@ with "%{_libexecdir}/%{name}/test". %prep %setup -q -n Carp-%{base_version} -%patch0 -p1 +%patch -P0 -p1 +%patch -P1 -p1 # Help file to recognise the Perl scripts for F in t/*.t; do @@ -91,6 +95,9 @@ make test %{_libexecdir}/%{name} %changelog +* Tue May 16 2023 Jitka Plesnikova - 1.54-1 +- Upgrade to 1.54 as provided in perl-5.37.11 + * Fri Jan 20 2023 Fedora Release Engineering - 1.52-490 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild