From 1ef59ea72815fa1a1128c5bfce6c475a31a87042 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Wed, 8 Feb 2023 16:17:00 +0800 Subject: [PATCH] remove versioned MODULE_COMPAT_ requires --- Storable-3.25-Upgrade-to-3.26.patch | 62 +++++++++++++++++++++++++++++ perl-Storable.spec | 13 ++++-- 2 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 Storable-3.25-Upgrade-to-3.26.patch diff --git a/Storable-3.25-Upgrade-to-3.26.patch b/Storable-3.25-Upgrade-to-3.26.patch new file mode 100644 index 0000000..fbd35e2 --- /dev/null +++ b/Storable-3.25-Upgrade-to-3.26.patch @@ -0,0 +1,62 @@ +From f987887d23adbbc950435921d0585c005cb03258 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Thu, 12 May 2022 12:34:06 +0200 +Subject: [PATCH] Upgrade to 3.26 + +--- + Makefile.PL | 2 +- + Storable.pm | 2 +- + Storable.xs | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index e03e141..b705654 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -29,7 +29,7 @@ WriteMakefile( + 'ExtUtils::MakeMaker' => '6.31', + }, + TEST_REQUIRES => { +- 'Test::More' => '0.41', ++ 'Test::More' => '0.82', + }, + ) + : () ), +diff --git a/Storable.pm b/Storable.pm +index 8e6ab25..ef417c6 100644 +--- a/Storable.pm ++++ b/Storable.pm +@@ -28,7 +28,7 @@ our @EXPORT_OK = qw( + our ($canonical, $forgive_me); + + BEGIN { +- our $VERSION = '3.25'; ++ our $VERSION = '3.26'; + } + + our $recursion_limit; +diff --git a/Storable.xs b/Storable.xs +index 6944b76..53c838c 100644 +--- a/Storable.xs ++++ b/Storable.xs +@@ -2187,7 +2187,7 @@ static AV *array_call(pTHX_ + XPUSHs(sv_2mortal(newSViv(cloning))); /* Cloning flag */ + PUTBACK; + +- count = call_sv(hook, G_ARRAY); /* Go back to Perl code */ ++ count = call_sv(hook, G_LIST); /* Go back to Perl code */ + + SPAGAIN; + +@@ -3318,7 +3318,7 @@ static int get_regexp(pTHX_ stcxt_t *cxt, SV* sv, SV **re, SV **flags) { + XPUSHs(rv); + PUTBACK; + /* optimize to call the XS directly later */ +- count = call_sv((SV*)cv, G_ARRAY); ++ count = call_sv((SV*)cv, G_LIST); + SPAGAIN; + if (count < 2) + CROAK(("re::regexp_pattern returned only %d results", (int)count)); +-- +2.34.3 + diff --git a/perl-Storable.spec b/perl-Storable.spec index e814034..8cb557c 100644 --- a/perl-Storable.spec +++ b/perl-Storable.spec @@ -1,14 +1,16 @@ -%define anolis_release 3 +%define anolis_release 1 %global base_version 3.25 Name: perl-Storable Epoch: 1 -Version: %{base_version} +Version: 3.26 Release: %{anolis_release}%{?dist} Summary: Persistence for Perl data structures # Storable.pm: GPL+ or Artistic -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/Storable Source0: https://cpan.metacpan.org/authors/id/N/NW/NWCLARK/Storable-%{base_version}.tar.gz +# Unbundled from perl 5.35.11 +Patch0: Storable-3.25-Upgrade-to-3.26.patch BuildRequires: coreutils BuildRequires: gcc BuildRequires: make @@ -54,7 +56,6 @@ BuildRequires: perl(Hash::Util) # Test::LeakTrace omitted because it's not a core module requried for building # core Storable. BuildRequires: perl(Tie::Hash) -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Config) # Fcntl is optional, but locking is good Requires: perl(Fcntl) @@ -101,6 +102,10 @@ make test %doc ChangeLog README %changelog +* Wed Feb 08 2023 mgb01105731 - 1:3.26-1 +- remove versioned MODULE_COMPAT_ requires +- update to version 3.26 + * Mon Jan 30 2023 Chunmei Xu - 1:3.25-3 - rebuild with perl 5.36.0 -- Gitee