From fbd6d049d2e8d7f8c34bbb17f4ef893aed24a6c5 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 22 Jun 2020 11:17:37 +0200
Subject: [PATCH] Upgrade to 1.61 as provided in perl-5.32.0

---
 perl-threads-shared.spec                  | 10 +++-
 threads-shared-1.59-Upgrade-to-1.61.patch | 57 +++++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 threads-shared-1.59-Upgrade-to-1.61.patch

diff --git a/perl-threads-shared.spec b/perl-threads-shared.spec
index 85afa2a..c549aac 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.60
-Release:        441%{?dist}
+Version:        1.61
+Release:        456%{?dist}
 Summary:        Perl extension for sharing data structures between threads
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/threads-shared
@@ -12,6 +12,8 @@ Patch0:         threads-shared-1.59-Upgrade-to-1.60.patch
 # Fix a memory leak when assigning a shared reference to a shared string
 # variable, in perl after 5.31.1
 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
 BuildRequires:  findutils
 BuildRequires:  gcc
 BuildRequires:  make
@@ -54,6 +56,7 @@ Win32). It is used together with the threads module.
 %setup -q -n threads-shared-%{base_version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="$RPM_OPT_FLAGS"
@@ -76,6 +79,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.61-456
+- Upgrade to 1.61 as provided in perl-5.32.0
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.60-441
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/threads-shared-1.59-Upgrade-to-1.61.patch b/threads-shared-1.59-Upgrade-to-1.61.patch
new file mode 100644
index 0000000..72e576b
--- /dev/null
+++ b/threads-shared-1.59-Upgrade-to-1.61.patch
@@ -0,0 +1,57 @@
+From c48ee9c79eb7c4a36b7758fc4c3209ca0e5d759b Mon Sep 17 00:00:00 2001
+From: Jitka Plesnikova <jplesnik@redhat.com>
+Date: Tue, 21 Apr 2020 12:52:31 +0200
+Subject: [PATCH] Upgrade to 1.61
+
+---
+ lib/threads/shared.pm | 4 ++--
+ t/stress.t            | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/threads/shared.pm b/lib/threads/shared.pm
+index 45ad154..bd0e437 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.60'; # Please update the pod, too.
++our $VERSION = '1.61'; # 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.60
++This document describes threads::shared version 1.61
+ 
+ =head1 SYNOPSIS
+ 
+diff --git a/t/stress.t b/t/stress.t
+index 1dd95e3..ccdeb0e 100644
+--- a/t/stress.t
++++ b/t/stress.t
+@@ -12,7 +12,7 @@ BEGIN {
+         exit(0);
+     }
+ 
+-    # http://lists.alioth.debian.org/pipermail/perl-maintainers/2011-June/002285.html
++    # https://lists.alioth.debian.org/pipermail/perl-maintainers/2011-June/002285.html
+     # There _is_ TLS support on m68k, but this stress test is overwhelming
+     # for the hardware
+     if ($^O eq 'linux' && $Config{archname} =~ /^m68k/) {
+@@ -179,7 +179,7 @@ use threads::shared;
+     } elsif ($timeouts) {
+         # Frequently fails under MSWin32 due to deadlocking bug in Windows
+         # hence test is TODO under MSWin32
+-        #   http://rt.perl.org/rt3/Public/Bug/Display.html?id=41574
++        #   https://rt.perl.org/rt3/Public/Bug/Display.html?id=41574
+         #   http://support.microsoft.com/kb/175332
+         if ($^O eq 'MSWin32') {
+             print("not ok 1 # TODO - not reliable under MSWin32\n")
+-- 
+2.21.1
+