From 79c173beee9e8a54c6083edd5728f10032e60cb1 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 18 Jul 2024 09:47:14 +0200 Subject: [PATCH] Upgrade to 3.91 based on perl-5.40.0-RC1 --- PathTools-3.89-Upgrade-to-3.91.patch | 193 +++++++++++++++++++++++++++ perl-PathTools.spec | 14 +- 2 files changed, 200 insertions(+), 7 deletions(-) create mode 100644 PathTools-3.89-Upgrade-to-3.91.patch diff --git a/PathTools-3.89-Upgrade-to-3.91.patch b/PathTools-3.89-Upgrade-to-3.91.patch new file mode 100644 index 0000000..862f8d2 --- /dev/null +++ b/PathTools-3.89-Upgrade-to-3.91.patch @@ -0,0 +1,193 @@ +From 0c5f0ea37e3c4d50f47c531bb32e184fa9c38980 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Thu, 9 May 2024 15:42:26 +0200 +Subject: [PATCH] Upgrade to 3.91 + +--- + Cwd.pm | 2 +- + Cwd.xs | 4 - + lib/File/Spec.pm | 2 +- + lib/File/Spec/AmigaOS.pm | 2 +- + lib/File/Spec/Cygwin.pm | 2 +- + lib/File/Spec/Epoc.pm | 2 +- + lib/File/Spec/Functions.pm | 4 +- + lib/File/Spec/Mac.pm | 2 +- + lib/File/Spec/OS2.pm | 2 +- + lib/File/Spec/Unix.pm | 2 +- + lib/File/Spec/Win32.pm | 4 +- + t/Spec.t | 196 ++++++++++++++++++++++++++++++++++++- + 12 files changed, 207 insertions(+), 17 deletions(-) + +diff --git a/Cwd.pm b/Cwd.pm +index dbf08a6..90013c9 100644 +--- a/Cwd.pm ++++ b/Cwd.pm +@@ -3,7 +3,7 @@ use strict; + use Exporter; + + +-our $VERSION = '3.89'; ++our $VERSION = '3.90'; + my $xs_version = $VERSION; + $VERSION =~ tr/_//d; + +diff --git a/Cwd.xs b/Cwd.xs +index ca8639d..bca575c 100644 +--- a/Cwd.xs ++++ b/Cwd.xs +@@ -292,7 +292,6 @@ return FALSE + #define getcwd_sv(a) Perl_getcwd_sv(aTHX_ a) + int Perl_getcwd_sv(pTHX_ SV *sv) + { +-#ifndef PERL_MICRO + + SvTAINTED_on(sv); + +@@ -430,9 +429,6 @@ int Perl_getcwd_sv(pTHX_ SV *sv) + } + #endif + +-#else +- return FALSE; +-#endif + } + + #endif +diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm +index fc10c0f..b2349be 100644 +--- a/lib/File/Spec.pm ++++ b/lib/File/Spec.pm +@@ -2,7 +2,7 @@ package File::Spec; + + use strict; + +-our $VERSION = '3.88'; ++our $VERSION = '3.90'; + $VERSION =~ tr/_//d; + + my %module = ( +diff --git a/lib/File/Spec/AmigaOS.pm b/lib/File/Spec/AmigaOS.pm +index 3fc3c98..c500d23 100644 +--- a/lib/File/Spec/AmigaOS.pm ++++ b/lib/File/Spec/AmigaOS.pm +@@ -3,7 +3,7 @@ package File::Spec::AmigaOS; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm +index fb3eaaa..ef1c9ec 100644 +--- a/lib/File/Spec/Cygwin.pm ++++ b/lib/File/Spec/Cygwin.pm +@@ -3,7 +3,7 @@ package File::Spec::Cygwin; + use strict; + require File::Spec::Unix; + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm +index 9391f3a..1bc81f6 100644 +--- a/lib/File/Spec/Epoc.pm ++++ b/lib/File/Spec/Epoc.pm +@@ -2,7 +2,7 @@ package File::Spec::Epoc; + + use strict; + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + require File::Spec::Unix; +diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm +index a0d8641..6068506 100644 +--- a/lib/File/Spec/Functions.pm ++++ b/lib/File/Spec/Functions.pm +@@ -3,7 +3,7 @@ package File::Spec::Functions; + use File::Spec; + use strict; + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + require Exporter; +@@ -72,7 +72,7 @@ File::Spec::Functions - portably perform operations on file names + =head1 SYNOPSIS + + use File::Spec::Functions; +- $x = catfile('a','b'); ++ my $x = catfile('a', 'b'); + + =head1 DESCRIPTION + +diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm +index 5f5cca9..08d7fdb 100644 +--- a/lib/File/Spec/Mac.pm ++++ b/lib/File/Spec/Mac.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm +index eea5328..d8533c0 100644 +--- a/lib/File/Spec/OS2.pm ++++ b/lib/File/Spec/OS2.pm +@@ -4,7 +4,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm +index 2d5af10..dbe36fb 100644 +--- a/lib/File/Spec/Unix.pm ++++ b/lib/File/Spec/Unix.pm +@@ -3,7 +3,7 @@ package File::Spec::Unix; + use strict; + use Cwd (); + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + =head1 NAME +diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm +index 292c2f8..f9225e6 100644 +--- a/lib/File/Spec/Win32.pm ++++ b/lib/File/Spec/Win32.pm +@@ -5,7 +5,7 @@ use strict; + use Cwd (); + require File::Spec::Unix; + +-our $VERSION = '3.88'; ++our $VERSION = '3.91'; + $VERSION =~ tr/_//d; + + our @ISA = qw(File::Spec::Unix); +@@ -249,7 +249,7 @@ Unlike just splitting the directories on the separator, leading empty and + trailing directory entries can be returned, because these are significant + on some OSs. So, + +- File::Spec->splitdir( "/a/b/c" ); ++ File::Spec->splitdir( "/a/b//c/" ); + + Yields: + +-- +2.45.0 + diff --git a/perl-PathTools.spec b/perl-PathTools.spec index 9a644fb..4528cd0 100644 --- a/perl-PathTools.spec +++ b/perl-PathTools.spec @@ -1,7 +1,7 @@ %global base_version 3.75 Name: perl-PathTools -Version: 3.89 +Version: 3.91 Release: 503%{?dist} Summary: PathTools Perl module (Cwd, File::Spec) # Cwd.xs: BSD-3-Clause @@ -19,6 +19,8 @@ Patch2: PathTools-3.78-Upgrade-to-3.80.patch Patch3: PathTools-3.80-Upgrade-to-3.84.patch # Unbundled from perl 5.37.11 Patch4: PathTools-3.84-Upgrade-to-3.89.patch +# Unbundled from perl 5.40.0-RC1 +Patch5: PathTools-3.89-Upgrade-to-3.91.patch BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc @@ -67,12 +69,7 @@ Tests from %{name}. Execute them with "%{_libexecdir}/%{name}/test". %prep -%setup -q -n PathTools-%{base_version} -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 +%autosetup -p1 -n PathTools-%{base_version} # Do not distribute File::Spec::VMS as it works on VMS only (bug #973713) rm lib/File/Spec/VMS.pm @@ -124,6 +121,9 @@ make test %{_libexecdir}/%{name} %changelog +* Thu Jul 18 2024 Jitka Plesnikova - 3.91-503 +- Upgrade to 3.91 as provided in 5.40.0-RC1 + * Mon Jun 24 2024 Troy Dawson - 3.89-503 - Bump release for June 2024 mass rebuild