From 5aeb67015c18c6d2700b48b679919ffa9ad82f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 13 Jan 2020 16:55:45 +0100
Subject: [PATCH] Move feature to perl-libs

"perl -E" loads "feature" module.
---
 gendep.macros |  4 +---
 perl.spec     | 36 ++++++------------------------------
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/gendep.macros b/gendep.macros
index d505d44..d0cff41 100644
--- a/gendep.macros
+++ b/gendep.macros
@@ -688,9 +688,6 @@ Requires: perl(strict) \
 Requires: perl(XSLoader) \
 Provides: perl(Fcntl) = 1.13 \
 %{nil}
-%global gendep_perl_feature \
-Provides: perl(feature) = 1.54 \
-%{nil}
 %global gendep_perl_fields \
 Requires: perl(:VERSION) >= 5.8.0 \
 Requires: perl(strict) \
@@ -2315,6 +2312,7 @@ Provides: perl(attributes) = 0.33 \
 Provides: perl(bytes) = 1.07 \
 Provides: perl(_charnames) = 1.45 \
 Provides: perl(charnames) = 1.45 \
+Provides: perl(feature) = 1.54 \
 Provides: perl(integer) = 1.01 \
 Provides: perl(re) = 0.37 \
 Provides: perl(strict) = 1.11 \
diff --git a/perl.spec b/perl.spec
index 2957bf5..1ee08f2 100644
--- a/perl.spec
+++ b/perl.spec
@@ -390,7 +390,7 @@ Requires:       perl-ExtUtils-Command,
 Requires:       perl-ExtUtils-Embed, perl-ExtUtils-Install,
 Requires:       perl-ExtUtils-MakeMaker, perl-ExtUtils-Manifest,
 Requires:       perl-ExtUtils-Miniperl, perl-ExtUtils-ParseXS,
-Requires:       perl-Fcntl, perl-feature, perl-fields,
+Requires:       perl-Fcntl, perl-fields,
 Requires:       perl-File-Basename, perl-File-Compare, perl-File-Copy,
 Requires:       perl-File-DosGlob, perl-File-Fetch,
 Requires:       perl-File-Find, perl-File-Path, perl-File-stat, perl-File-Temp,
@@ -1865,26 +1865,6 @@ Conflicts:      perl-interpreter < 4:5.30.1-451
 %description Fcntl
 Fcntl module provides file operation related options.
 
-%package feature
-Summary:        Pragma to enable new Perl features
-License:        GPL+ or Artistic
-Epoch:          0
-Version:        1.54
-BuildArch:      noarch
-Requires:       %perl_compat
-Requires:       perl(Carp)
-%if %{defined perl_bootstrap}
-%gendep_perl_feature
-%endif
-Conflicts:      perl < 4:5.30.1-451
-
-%description feature
-It is usually impossible to add new syntax to Perl without breaking some
-existing programs. This pragma provides a way to minimize that risk. New
-syntactic constructs, or new semantic meanings to older constructs, can be
-enabled by "use feature 'foo'", and will be parsed only when the appropriate
-feature pragma is in scope.
-
 %package fields
 Summary:        Compile-time class fields
 License:        GPL+ or Artistic
@@ -4714,6 +4694,7 @@ popd
 %exclude %{privlib}/bytes_heavy.pl
 %exclude %{privlib}/_charnames.pm
 %exclude %{privlib}/charnames.pm
+%exclude %{privlib}/feature.pm
 %exclude %{privlib}/integer.pm
 %exclude %{privlib}/PerlIO.pm
 %exclude %{privlib}/strict.pm
@@ -4731,6 +4712,7 @@ popd
 %exclude %{_mandir}/man3/bytes.*
 %exclude %{_mandir}/man3/charnames.*
 %exclude %{_mandir}/man3/Config.*
+%exclude %{_mandir}/man3/feature.3*
 %exclude %{_mandir}/man3/File::Glob.*
 %exclude %{_mandir}/man3/integer.*
 %exclude %{_mandir}/man3/PerlIO.*
@@ -5151,10 +5133,6 @@ popd
 %exclude %{archlib}/auto/Fcntl
 %exclude %{_mandir}/man3/Fcntl.3*
 
-# feature
-%exclude %{privlib}/feature.pm
-%exclude %{_mandir}/man3/feature.3*
-
 # fields
 %exclude %{privlib}/fields.pm
 %exclude %{_mandir}/man3/fields.3*
@@ -5995,6 +5973,7 @@ popd
 %{privlib}/bytes_heavy.pl
 %{privlib}/_charnames.pm
 %{privlib}/charnames.pm
+%{privlib}/feature.pm
 %{privlib}/integer.pm
 %{privlib}/PerlIO.pm
 %{privlib}/strict.pm
@@ -6013,6 +5992,7 @@ popd
 %{_mandir}/man3/bytes.*
 %{_mandir}/man3/charnames.*
 %{_mandir}/man3/Config.*
+%{_mandir}/man3/feature.3*
 %{_mandir}/man3/File::Glob.*
 %{_mandir}/man3/integer.*
 %{_mandir}/man3/PerlIO.*
@@ -6519,10 +6499,6 @@ popd
 %{archlib}/auto/Fcntl
 %{_mandir}/man3/Fcntl.3*
 
-%files feature
-%{privlib}/feature.pm
-%{_mandir}/man3/feature.3*
-
 %files fields
 %{privlib}/fields.pm
 %{_mandir}/man3/fields.3*
@@ -7556,7 +7532,6 @@ popd
 - Subpackage SelectSaver
 - Move UNIVERSAL to perl-libs
 - Subpackage DynaLoader
-- Subpackage feature
 - Subpackage filetest
 - Subpackage less
 - Subpackage meta_notation
@@ -7566,6 +7541,7 @@ popd
 - Subpackage vars
 - Subpackage vmsish
 - Subpackage Pod-Functions
+- Move feature to perl-libs
 
 * 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