From 37182fa808ec601422bdfbe9480a8e1dd9de988f 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:22:00 +0100
Subject: [PATCH] Subpackage User-pwent

perl-User package already exists (from CPAN). Therfore use
perl-User-pwent package name.
---
 gendep.macros  | 13 +++++++++++--
 perl.rpmlintrc |  2 +-
 perl.spec      | 27 ++++++++++++++++++++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/gendep.macros b/gendep.macros
index 921a7eb..083855f 100644
--- a/gendep.macros
+++ b/gendep.macros
@@ -1961,6 +1961,17 @@ Provides: perl(Unicode::Normalize) = 1.26 \
 %{nil}
 %global gendep_perl_Unicode_Normalize_debuginfo \
 %{nil}
+%global gendep_perl_User_pwent \
+Requires: perl(:VERSION) >= 5.6.0 \
+Requires: perl(Carp) \
+Requires: perl(Class::Struct) \
+Requires: perl(Config) \
+Requires: perl(Exporter) \
+Requires: perl(strict) \
+Requires: perl(warnings) \
+Provides: perl(User::grent) = 1.03 \
+Provides: perl(User::pwent) = 1.01 \
+%{nil}
 %global gendep_perl_autodie \
 Requires: perl(:VERSION) >= 5.8.0 \
 Requires: perl(Carp) \
@@ -2117,8 +2128,6 @@ Provides: perl(Time::localtime) = 1.03 \
 Provides: perl(Time::tm) = 1.00 \
 Provides: perl(UNIVERSAL) = 1.13 \
 Provides: perl(Unicode::UCD) = 0.72 \
-Provides: perl(User::grent) = 1.03 \
-Provides: perl(User::pwent) = 1.01 \
 Provides: perl(deprecate) = 0.04 \
 Provides: perl(diagnostics) = 1.36 \
 Provides: perl(dumpvar.pl) \
diff --git a/perl.rpmlintrc b/perl.rpmlintrc
index bd91c0f..3ae2afb 100644
--- a/perl.rpmlintrc
+++ b/perl.rpmlintrc
@@ -1,5 +1,5 @@
 from Config import *
-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("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("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 928f29d..b91f4f3 100644
--- a/perl.spec
+++ b/perl.spec
@@ -433,7 +433,7 @@ Requires:       perl-Thread-Queue, perl-Thread-Semaphore,
 Requires:       perl-threads, perl-threads-shared,
 Requires:       perl-Tie-File, perl-Tie-Memoize, perl-Tie-RefHash,
 Requires:       perl-Time-HiRes, perl-Time-Local, perl-Time-Piece,
-Requires:       perl-Unicode-Collate, perl-Unicode-Normalize,
+Requires:       perl-Unicode-Collate, perl-Unicode-Normalize, perl-User-pwent,
 Requires:       perl-version,
 
 # Full EVR is for compatibility with systems that swapped perl and perl-core
@@ -3627,6 +3627,22 @@ This package provides Perl functions that can convert strings into various
 Unicode normalization forms as defined in Unicode Standard Annex #15.
 %endif
 
+%package User-pwent
+Summary:        By-name interface to Perl built-in user name resolver
+License:        GPL+ or Artistic
+Epoch:          0
+Version:        1.03
+BuildArch:      noarch
+Requires:       %perl_compat
+%if %{defined perl_bootstrap}
+%gendep_perl_User_pwent
+%endif
+Conflicts:      perl-interpreter < 4:5.30.1-451
+
+%description User-pwent
+This package provides an object-oriented interface to Perl build-in getgr*()
+and getpw*() functions.
+
 %if %{dual_life} || %{rebuild_from_scratch}
 %package version
 Summary:        Perl extension for Version Objects
@@ -5202,6 +5218,10 @@ popd
 %exclude %{archlib}/Unicode/Normalize.pm
 %exclude %{_mandir}/man3/Unicode::Normalize.*
 
+# User-pwent
+%exclude %{privlib}/User
+%exclude %{_mandir}/man3/User::*
+
 # version
 %exclude %{privlib}/version.pm
 %exclude %{privlib}/version.pod
@@ -6557,6 +6577,10 @@ popd
 %{_mandir}/man3/Unicode::Normalize.*
 %endif
 
+%files User-pwent
+%{privlib}/User
+%{_mandir}/man3/User::*
+
 %if %{dual_life} || %{rebuild_from_scratch}
 %files version
 %{privlib}/version.pm
@@ -6617,6 +6641,7 @@ popd
 - Subpackage File-stat
 - Subpackage Class-Struct
 - Subpackage Net::*ent modules into perl-Net
+- Subpackage User::* modules into perl-User-pwent
 
 * 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