From de9374270a734b8f5917ad67fd24f42d949ecd36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 3 Jan 2020 14:02:07 +0100
Subject: [PATCH] Subpackage Thread

---
 gendep.macros  | 12 +++++++++---
 perl.rpmlintrc |  2 +-
 perl.spec      | 37 ++++++++++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/gendep.macros b/gendep.macros
index bfe3c42..18cd983 100644
--- a/gendep.macros
+++ b/gendep.macros
@@ -1917,6 +1917,15 @@ Requires: perl(vars) \
 Provides: perl(Tie::RefHash) = 1.39 \
 Provides: perl(Tie::RefHash::Nestable) \
 %{nil}
+%global gendep_perl_Thread \
+Requires: perl(Config) \
+Requires: perl(Exporter) \
+Requires: perl(strict) \
+Requires: perl(threads) \
+Requires: perl(threads::shared) \
+Requires: perl(warnings) \
+Provides: perl(Thread) = 3.04 \
+%{nil}
 %global gendep_perl_Thread_Queue \
 Requires: perl(Scalar::Util) >= 1.10 \
 Requires: perl(strict) \
@@ -2125,8 +2134,6 @@ Requires: perl(feature) \
 Requires: perl(if) \
 Requires: perl(integer) \
 Requires: perl(strict) \
-Requires: perl(threads) \
-Requires: perl(threads::shared) \
 Requires: perl(warnings) \
 Requires: perl(warnings::register) \
 Provides: perl(Config::Extensions) = 0.03 \
@@ -2143,7 +2150,6 @@ Provides: perl(Getopt::Std) = 1.12 \
 Provides: perl(Pod::Functions) = 1.13 \
 Provides: perl(SelectSaver) = 1.02 \
 Provides: perl(Symbol) = 1.08 \
-Provides: perl(Thread) = 3.04 \
 Provides: perl(UNIVERSAL) = 1.13 \
 Provides: perl(Unicode::UCD) = 0.72 \
 Provides: perl(deprecate) = 0.04 \
diff --git a/perl.rpmlintrc b/perl.rpmlintrc
index 3ae2afb..0ce5d11 100644
--- a/perl.rpmlintrc
+++ b/perl.rpmlintrc
@@ -1,5 +1,5 @@
 from Config import *
-addFilter("spelling-error .* (autoloaded|awk|cacheout|decrement|exe|gdbm|getgr|gethost|getnet|getproto|getpw|getserv|globbing|gmtime|groff|libnet|localtime|lstat|Memoizing|metapackage|ndbm|Nestable|odbm|opcodes|perlbug|perldoc|perlfunc|perlglob|perllocale|perlmain|perlpod|perlsub|reachability|redispatch|rpmbuild|sdbm|sed|splain|truncations|usr|writemain)");
+addFilter("spelling-error .* (autoloaded|awk|cacheout|decrement|exe|gdbm|getgr|gethost|getnet|getproto|getpw|getserv|globbing|gmtime|groff|ithreads|libnet|localtime|lstat|Memoizing|metapackage|ndbm|Nestable|odbm|opcodes|perlbug|perldoc|perlfunc|perlglob|perllocale|perlmain|perlpod|perlsub|reachability|redispatch|rpmbuild|sdbm|sed|splain|truncations|usr|writemain)");
 addFilter("unexpanded-macro %description .* %INC");
 # POSIX module provides wrappers for libc functions
 addFilter("missing-call-to-setgroups-before-setuid .*/auto/POSIX/POSIX.so");
diff --git a/perl.spec b/perl.spec
index b4b68f5..2d88aeb 100644
--- a/perl.spec
+++ b/perl.spec
@@ -430,7 +430,7 @@ Requires:       perl-Term-ReadLine,
 Requires:       perl-Test, perl-Test-Harness, perl-Test-Simple,
 Requires:       perl-Text-Abbrev, perl-Text-Balanced, perl-Text-ParseWords,
 Requires:       perl-Text-Tabs+Wrap,
-Requires:       perl-Thread-Queue, perl-Thread-Semaphore,
+Requires:       perl-Thread, perl-Thread-Queue, perl-Thread-Semaphore,
 Requires:       perl-threads, perl-threads-shared,
 Requires:       perl-Tie, perl-Tie-File, perl-Tie-Memoize, perl-Tie-RefHash,
 Requires:       perl-Time, perl-Time-HiRes, perl-Time-Local, perl-Time-Piece,
@@ -3432,6 +3432,31 @@ Text::Wrap::wrap() will reformat lines into paragraphs. All it does is break
 up long lines, it will not join short lines together.
 %endif
 
+%package Thread
+Summary:        Manipulate threads in Perl (for old code only)
+License:        GPL+ or Artistic
+Epoch:          0
+Version:        3.04
+BuildArch:      noarch
+Requires:       %perl_compat
+%if %{defined perl_bootstrap}
+%gendep_perl_Thread
+%endif
+Conflicts:      perl < 4:5.30.1-451
+
+%description Thread
+This Thread module served as the front end to the old-style thread model,
+called 5005threads, that has been removed in version 5.10.
+
+For old code and interim backwards compatibility, the Thread module has been
+reworked to function as a front end for the new interpreter threads (ithreads)
+model. However, some previous functionality is not available. Further, the
+data sharing models between the two thread models are completely different,
+and anything to do with data sharing has to be thought differently.
+
+You are strongly encouraged to migrate any existing threaded code to the new
+model (i.e., use the threads and threads::shared modules) as soon as possible.
+
 %if %{dual_life} || %{rebuild_from_scratch}
 %package Thread-Queue
 Summary:        Thread-safe queues
@@ -5239,11 +5264,16 @@ popd
 %exclude %{_mandir}/man3/Text::Tabs.*
 %exclude %{_mandir}/man3/Text::Wrap.*
 
+# Thread
+%exclude %{privlib}/Thread.pm
+%exclude %{_mandir}/man3/Thread.*
+
 # Thread-Queue
 %exclude %{privlib}/Thread/Queue.pm
 %exclude %{_mandir}/man3/Thread::Queue.*
 
 # Thread-Semaphore
+%exclude %dir %{privlib}/Thread
 %exclude %{privlib}/Thread/Semaphore.pm
 %exclude %{_mandir}/man3/Thread::Semaphore.*
 
@@ -6620,6 +6650,10 @@ popd
 %{_mandir}/man3/Text::Wrap.*
 %endif
 
+%files Thread
+%{privlib}/Thread.pm
+%{_mandir}/man3/Thread.*
+
 %if %{dual_life} || %{rebuild_from_scratch}
 %files Thread-Queue
 %dir %{privlib}/Thread
@@ -6806,6 +6840,7 @@ popd
 - Move warnings::register to perl-libs
 - Subpackage DBM_Filter modules
 - Subpackage FileHandle
+- Subpackage Thread
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4:5.30.1-450
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild