diff --git a/gendep.macros b/gendep.macros index b012d0c..c4c66ee 100644 --- a/gendep.macros +++ b/gendep.macros @@ -616,6 +616,12 @@ Requires: perl(:VERSION) >= 5.8.0 \ Requires: perl(strict) \ Provides: perl(fields) = 2.24 \ %{nil} +%global gendep_perl_File_DosGlob \ +Requires: perl(strict) \ +Requires: perl(warnings) \ +Requires: perl(XSLoader) \ +Provides: perl(File::DosGlob) = 1.12 \ +%{nil} %global gendep_perl_File_Fetch \ Requires: perl(Carp) \ Requires: perl(Cwd) \ @@ -1953,7 +1959,6 @@ Provides: perl(Fcntl) = 1.13 \ Provides: perl(File::Basename) = 2.85 \ Provides: perl(File::Compare) = 1.1006 \ Provides: perl(File::Copy) = 2.34 \ -Provides: perl(File::DosGlob) = 1.12 \ Provides: perl(File::Find) = 1.36 \ Provides: perl(File::stat) = 1.08 \ Provides: perl(FileCache) = 1.10 \ diff --git a/perl.rpmlintrc b/perl.rpmlintrc index 49b75f2..4b55046 100644 --- a/perl.rpmlintrc +++ b/perl.rpmlintrc @@ -1,5 +1,5 @@ from Config import * -addFilter("spelling-error .* (autoloaded|awk|decrement|gdbm|gmtime|groff|libnet|localtime|Memoizing|metapackage|ndbm|Nestable|odbm|perlbug|perldoc|perlfunc|perllocale|perlmain|perlpod|perlsub|reachability|redispatch|rpmbuild|sdbm|sed|splain|truncations|usr|writemain)"); +addFilter("spelling-error .* (autoloaded|awk|decrement|exe|gdbm|globbing|gmtime|groff|libnet|localtime|Memoizing|metapackage|ndbm|Nestable|odbm|perlbug|perldoc|perlfunc|perlglob|perllocale|perlmain|perlpod|perlsub|reachability|redispatch|rpmbuild|sdbm|sed|splain|truncations|usr|writemain)"); addFilter("unexpanded-macro %description .* %INC"); # Applied with "git am" addFilter("patch-not-applied Patch58: perl-5.30.0-PATCH-perl-134329-Use-after-free-in-regcomp.c.patch"); diff --git a/perl.spec b/perl.spec index 2296803..57b203f 100644 --- a/perl.spec +++ b/perl.spec @@ -385,7 +385,8 @@ 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-fields, perl-File-Fetch, perl-File-Path, perl-File-Temp, +Requires: perl-fields, perl-File-DosGlob, perl-File-Fetch, +Requires: perl-File-Path, perl-File-Temp, Requires: perl-Filter, perl-Filter-Simple, %if %{with gdbm} Requires: perl-GDBM_File, @@ -1632,6 +1633,23 @@ Conflicts: perl < 4:5.30.1-451 %description fields The "fields" pragma enables compile-time and run-time verified class fields. +%package File-DosGlob +Summary: DOS-like globbing +License: GPL+ or Artistic +Epoch: 0 +Version: 1.12 +Requires: %perl_compat +Requires: perl(Text::ParseWords) +%if %{defined perl_bootstrap} +%gendep_perl_File_DosGlob +%endif +Conflicts: perl-interpreter < 4:5.30.1-451 + +%description File-DosGlob +This Perl module implements DOS-like globbing with a few enhancements. It +is largely compatible with perlglob.exe in all but one respect--it understands +wild cards in directory components. + %if %{dual_life} || %{rebuild_from_scratch} %package File-Fetch Summary: Generic file fetching mechanism @@ -4113,6 +4131,11 @@ popd %exclude %{privlib}/fields.pm %exclude %{_mandir}/man3/fields.3* +# File-DosGlob +%exclude %{archlib}/File/DosGlob.pm +%exclude %{archlib}/auto/File/DosGlob +%exclude %{_mandir}/man3/File::DosGlob.3* + # File-Fetch %exclude %{privlib}/File/Fetch.pm %exclude %{_mandir}/man3/File::Fetch.3* @@ -5181,6 +5204,13 @@ popd %{privlib}/fields.pm %{_mandir}/man3/fields.3* +%files File-DosGlob +%dir %{archlib}/File +%{archlib}/File/DosGlob.pm +%dir %{archlib}/auto/File +%{archlib}/auto/File/DosGlob +%{_mandir}/man3/File::DosGlob.3* + %if %{dual_life} || %{rebuild_from_scratch} %files File-Fetch %dir %{privlib}/File @@ -5957,6 +5987,7 @@ popd - Subpackage ODBM_File - Subpackage SDBM_File - Move File::Glob module into perl-libs +- Subpackage File-DosGlob * Wed Jan 29 2020 Fedora Release Engineering - 4:5.30.1-450 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild