From 927cbfc2ef7f73a04f103043ea7e162d9e3a8986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 13 Dec 2019 16:02:44 +0100
Subject: [PATCH] Subpackage Net::*ent modules into perl-Net

---
 gendep.macros  | 14 ++++++++++----
 perl.rpmlintrc |  2 +-
 perl.spec      | 42 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/gendep.macros b/gendep.macros
index 8d4f8f4..921a7eb 100644
--- a/gendep.macros
+++ b/gendep.macros
@@ -1191,6 +1191,16 @@ Requires: perl(warnings) \
 Requires: perl(XSLoader) \
 Provides: perl(NDBM_File) = 1.15 \
 %{nil}
+%global gendep_perl_Net \
+Requires: perl(:VERSION) >= 5.6.0 \
+Requires: perl(Class::Struct) \
+Requires: perl(Exporter) \
+Requires: perl(strict) \
+Provides: perl(Net::hostent) = 1.02 \
+Provides: perl(Net::netent) = 1.01 \
+Provides: perl(Net::protoent) = 1.01 \
+Provides: perl(Net::servent) = 1.02 \
+%{nil}
 %global gendep_perl_Net_Ping \
 Requires: perl(:VERSION) >= 5.2.0 \
 Requires: perl(Carp) \
@@ -2087,10 +2097,6 @@ Provides: perl(File::Copy) = 2.34 \
 Provides: perl(FileHandle) = 2.03 \
 Provides: perl(FindBin) = 1.51 \
 Provides: perl(Getopt::Std) = 1.12 \
-Provides: perl(Net::hostent) = 1.02 \
-Provides: perl(Net::netent) = 1.01 \
-Provides: perl(Net::protoent) = 1.01 \
-Provides: perl(Net::servent) = 1.02 \
 Provides: perl(Pod::Functions) = 1.13 \
 Provides: perl(SelectSaver) = 1.02 \
 Provides: perl(Symbol) = 1.08 \
diff --git a/perl.rpmlintrc b/perl.rpmlintrc
index 81fe412..bd91c0f 100644
--- a/perl.rpmlintrc
+++ b/perl.rpmlintrc
@@ -1,5 +1,5 @@
 from Config import *
-addFilter("spelling-error .* (autoloaded|awk|cacheout|decrement|exe|gdbm|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|gethost|getnet|getproto|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("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 a44495d..928f29d 100644
--- a/perl.spec
+++ b/perl.spec
@@ -410,7 +410,7 @@ Requires:       perl-mro,
 %if %{with gdbm}
 Requires:       perl-NDBM_File,
 %endif
-Requires:       perl-Net-Ping, perl-NEXT,
+Requires:       perl-Net, perl-Net-Ping, perl-NEXT,
 %if %{with gdbm}
 Requires:       perl-ODBM_File,
 %endif
@@ -2608,6 +2608,23 @@ a Perl hash, but when your program exits, the data will remain in the file, to
 be used the next time your program runs.
 %endif
 
+%package Net
+Summary:        By-name interface to Perl built-in network resolver
+License:        GPL+ or Artistic
+Epoch:          0
+Version:        1.02
+BuildArch:      noarch
+Requires:       %perl_compat
+Requires:       perl(Socket)
+%if %{defined perl_bootstrap}
+%gendep_perl_Net
+%endif
+Conflicts:      perl-interpreter < 4:5.30.1-451
+
+%description Net
+This package provide object-oriented interface to Perl built-in gethost*(),
+getnet*(), getproto*(), and getserv*() functions.
+
 %package Net-Ping
 Summary:        Check a remote host for reachability
 License:        GPL+ or Artistic
@@ -4858,7 +4875,18 @@ popd
 %exclude %{_mandir}/man3/NDBM_File.3*
 %endif
 
+# Net
+%exclude %{privlib}/Net/hostent.pm
+%exclude %{privlib}/Net/netent.pm
+%exclude %{privlib}/Net/protoent.pm
+%exclude %{privlib}/Net/servent.pm
+%exclude %{_mandir}/man3/Net::hostent.3*
+%exclude %{_mandir}/man3/Net::netent.3*
+%exclude %{_mandir}/man3/Net::protoent.3*
+%exclude %{_mandir}/man3/Net::servent.3*
+
 # Net-Ping
+%exclude %dir %{privlib}/Net
 %exclude %{privlib}/Net/Ping.pm
 %exclude %{_mandir}/man3/Net::Ping.*
 
@@ -6110,6 +6138,17 @@ popd
 %{_mandir}/man3/NDBM_File.3*
 %endif
 
+%files Net
+%dir %{privlib}/Net
+%{privlib}/Net/hostent.pm
+%{privlib}/Net/netent.pm
+%{privlib}/Net/protoent.pm
+%{privlib}/Net/servent.pm
+%{_mandir}/man3/Net::hostent.3*
+%{_mandir}/man3/Net::netent.3*
+%{_mandir}/man3/Net::protoent.3*
+%{_mandir}/man3/Net::servent.3*
+
 %files Net-Ping
 %dir %{privlib}/Net
 %{privlib}/Net/Ping.pm
@@ -6577,6 +6616,7 @@ popd
 - Move charnames to perl-libs
 - Subpackage File-stat
 - Subpackage Class-Struct
+- Subpackage Net::*ent modules into perl-Net
 
 * 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