diff --git a/perl-threads-shared.spec b/perl-threads-shared.spec index 4e4aaab..4929a24 100644 --- a/perl-threads-shared.spec +++ b/perl-threads-shared.spec @@ -1,8 +1,8 @@ %global base_version 1.59 Name: perl-threads-shared -Version: 1.61 -Release: 458%{?dist} +Version: 1.62 +Release: 477%{?dist} Summary: Perl extension for sharing data structures between threads License: GPL+ or Artistic URL: https://metacpan.org/release/threads-shared @@ -14,6 +14,8 @@ Patch0: threads-shared-1.59-Upgrade-to-1.60.patch Patch1: threads-shared-1.60-threads-shared-fix-leak.patch # Unbundled from perl 5.32.0 Patch2: threads-shared-1.59-Upgrade-to-1.61.patch +# Unbundled from perl 5.34.0 +Patch3: threads-shared-1.61-Upgrade-to-1.62.patch BuildRequires: findutils BuildRequires: gcc BuildRequires: make @@ -57,6 +59,7 @@ Win32). It is used together with the threads module. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="$RPM_OPT_FLAGS" @@ -79,6 +82,9 @@ make test %{_mandir}/man3/* %changelog +* Fri May 21 2021 Jitka Plesnikova - 1.62-477 +- Upgrade to 1.62 as provided in perl-5.34.0 + * Wed Jan 27 2021 Fedora Release Engineering - 1.61-458 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/threads-shared-1.61-Upgrade-to-1.62.patch b/threads-shared-1.61-Upgrade-to-1.62.patch new file mode 100644 index 0000000..553e058 --- /dev/null +++ b/threads-shared-1.61-Upgrade-to-1.62.patch @@ -0,0 +1,48 @@ +From 25d469721e26fbc7afd670776ae9523013e9fdf5 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Thu, 6 May 2021 10:38:30 +0200 +Subject: [PATCH] Upgrade to 1.62 + +--- + lib/threads/shared.pm | 4 ++-- + shared.xs | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/threads/shared.pm b/lib/threads/shared.pm +index bd0e437..3674d83 100644 +--- a/lib/threads/shared.pm ++++ b/lib/threads/shared.pm +@@ -8,7 +8,7 @@ use Config; + + use Scalar::Util qw(reftype refaddr blessed); + +-our $VERSION = '1.61'; # Please update the pod, too. ++our $VERSION = '1.62'; # Please update the pod, too. + my $XS_VERSION = $VERSION; + $VERSION = eval $VERSION; + +@@ -196,7 +196,7 @@ threads::shared - Perl extension for sharing data structures between threads + + =head1 VERSION + +-This document describes threads::shared version 1.61 ++This document describes threads::shared version 1.62 + + =head1 SYNOPSIS + +diff --git a/shared.xs b/shared.xs +index 858c6d6..4931a61 100644 +--- a/shared.xs ++++ b/shared.xs +@@ -1183,7 +1183,7 @@ sharedsv_array_mg_free(pTHX_ SV *sv, MAGIC *mg) + * This is called when perl is about to access an element of + * the array - + */ +-#if PERL_VERSION >= 11 ++#if PERL_VERSION_GE(5,11,0) + static int + sharedsv_array_mg_copy(pTHX_ SV *sv, MAGIC* mg, + SV *nsv, const char *name, I32 namlen) +-- +2.30.2 +