diff --git a/perl-threads-shared.spec b/perl-threads-shared.spec index dbc877d..ea250e7 100644 --- a/perl-threads-shared.spec +++ b/perl-threads-shared.spec @@ -1,7 +1,7 @@ %global base_version 1.59 Name: perl-threads-shared -Version: 1.68 +Version: 1.69 Release: 503%{?dist} Summary: Perl extension for sharing data structures between threads License: GPL-1.0-or-later OR Artistic-1.0-Perl @@ -20,6 +20,8 @@ Patch3: threads-shared-1.61-Upgrade-to-1.62.patch Patch4: threads-shared-1.62-Upgrade-to-1.64.patch # Unbundled from perl 5.37.11 Patch5: threads-shared-1.64-Upgrade-to-1.68.patch +# Unbundled from perl 5.40.0-RC1 +Patch6: threads-shared-1.68-Upgrade-to-1.69.patch BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc @@ -70,13 +72,7 @@ Tests from %{name}. Execute them with "%{_libexecdir}/%{name}/test". %prep -%setup -q -n threads-shared-%{base_version} -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%patch -P5 -p1 +%autosetup -p1 -n threads-shared-%{base_version} # Help generators to recognize Perl scripts for F in t/*.t t/*pl; do @@ -110,7 +106,7 @@ make test %files %doc Changes examples README -%{perl_vendorarch}/auto/* +%{perl_vendorarch}/auto/threads* %{perl_vendorarch}/threads* %{_mandir}/man3/threads::shared* @@ -118,6 +114,9 @@ make test %{_libexecdir}/%{name} %changelog +* Thu Jul 18 2024 Jitka Plesnikova - 1.69-503 +- Upgrade to 1.69 as provided in perl-5.40.0-RC1 + * Mon Jun 24 2024 Troy Dawson - 1.68-503 - Bump release for June 2024 mass rebuild diff --git a/threads-shared-1.68-Upgrade-to-1.69.patch b/threads-shared-1.68-Upgrade-to-1.69.patch new file mode 100644 index 0000000..14f25ba --- /dev/null +++ b/threads-shared-1.68-Upgrade-to-1.69.patch @@ -0,0 +1,39 @@ +From 19d50c0cc8db9e17816d8f9ee2bc89968ec4ffc2 Mon Sep 17 00:00:00 2001 +From: Jitka Plesnikova +Date: Thu, 9 May 2024 16:16:42 +0200 +Subject: [PATCH] Upgrade to 1.69 + +--- + lib/threads/shared.pm | 2 +- + shared.xs | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/threads/shared.pm b/lib/threads/shared.pm +index 6e67acd..fef27ab 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.68'; # Please update the pod, too. ++our $VERSION = '1.69'; # Please update the pod, too. + my $XS_VERSION = $VERSION; + $VERSION = eval $VERSION; + +diff --git a/shared.xs b/shared.xs +index f78542d..938f963 100644 +--- a/shared.xs ++++ b/shared.xs +@@ -697,7 +697,7 @@ Perl_sharedsv_cond_timedwait(perl_cond *cond, perl_mutex *mut, double abs) + struct timespec ts; + int got_it = 0; + +- ts.tv_sec = (long)abs; ++ ts.tv_sec = (time_t)abs; + abs -= (NV)ts.tv_sec; + ts.tv_nsec = (long)(abs * 1000000000.0); + +-- +2.45.0 +