From dc45d8ee83b590720fb59b6ac1887d091196fad4 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 22 Sep 2019 20:14:35 +0100 Subject: [PATCH] Tidy up for EPEL-8 build - Specify all build dependencies - Expand %description - Add patch to fix POD so we get properly-coded manpage - Modernize spec using %{make_build} and %{make_install} - Make %files list more explicit - Use author-independent source URL --- Regexp-Common-2013030901-pod.patch | 14 +++++ perl-Regexp-Common.spec | 92 ++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 31 deletions(-) create mode 100644 Regexp-Common-2013030901-pod.patch diff --git a/Regexp-Common-2013030901-pod.patch b/Regexp-Common-2013030901-pod.patch new file mode 100644 index 0000000..661148e --- /dev/null +++ b/Regexp-Common-2013030901-pod.patch @@ -0,0 +1,14 @@ +Use proper entity name for accented character, so we get properly-encoded +output. + +--- lib/Regexp/Common.pm ++++ lib/Regexp/Common.pm +@@ -821,7 +821,7 @@ + Charles Thomas, Chris Vertonghen, the CPAN Testers, David Hand, + Fany, Geoffrey Leach, Hermann-Marcus Behrens, Jerome Quelin, Jim Cromie, + Lars Wilke, Linda Julien, Mike Arms, Mike Castle, Mikko, Murat Uenalan, +-RafaE<235>l Garcia-Suarez, Ron Savage, Sam Vilain, Slaven Rezic, Smylers, ++RafaEl Garcia-Suarez, Ron Savage, Sam Vilain, Slaven Rezic, Smylers, + Tim Maher, and all the others I've forgotten. + + =head1 AUTHOR diff --git a/perl-Regexp-Common.spec b/perl-Regexp-Common.spec index 4af0a28..45dbdd3 100644 --- a/perl-Regexp-Common.spec +++ b/perl-Regexp-Common.spec @@ -1,58 +1,88 @@ Name: perl-Regexp-Common Version: 2017060201 -Release: 10%{?dist} -Summary: Regexp::Common Perl module +Release: 11%{?dist} +Summary: Provide commonly requested regular expressions # Old Artistic 1.0 is also valid, but we won't list it here since it is non-free. # Also, it would throw off the automated license check and flag this package. License: Artistic 2.0 or MIT or BSD URL: https://metacpan.org/release/Regexp-Common -Source0: https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/Regexp-Common-%{version}.tar.gz - -BuildArch: noarch - -BuildRequires: %{__perl} -BuildRequires: %{__make} - +Source0: https://cpan.metacpan.org/modules/by-module/Regexp/Regexp-Common-%{version}.tar.gz +Patch0: Regexp-Common-2013030901-pod.patch +BuildArch: noarch +# Module Build +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Carp) -BuildRequires: perl(Config) -BuildRequires: perl(Exporter) -BuildRequires: perl(overload) -BuildRequires: perl(re) -BuildRequires: perl(strict) -BuildRequires: perl(vars) -BuildRequires: perl(warnings) - -# for improved tests +BuildRequires: perl-interpreter +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +# Module Runtime +BuildRequires: perl(Carp) +BuildRequires: perl(charnames) +BuildRequires: perl(Config) +BuildRequires: perl(Exporter) +BuildRequires: perl(overload) +BuildRequires: perl(re) +BuildRequires: perl(strict) +BuildRequires: perl(vars) +BuildRequires: perl(warnings) +# Test Suite +BuildRequires: perl(constant) +BuildRequires: perl(lib) BuildRequires: perl(Test::More) +# Optional Tests BuildRequires: perl(Test::Regexp) - -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# Dependencies +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(Carp) %description -Regexp::Common - Provide commonly requested regular expressions +By default, this module exports a single hash (`%%RE') that stores or generates +commonly needed regular expressions. Patterns currently provided include: + + * balanced parentheses and brackets + * delimited text (with escapes) + * integers and floating-point numbers in any base (up to 36) + * comments in 44 languages + * offensive language + * lists of any pattern + * IPv4 addresses + * URIs + * Zip codes %prep %setup -q -n Regexp-Common-%{version} +# Fix POD so we get properly-coded manpage +%patch0 + %build -%{__perl} Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -%{__make} %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT -chmod -R u+w $RPM_BUILD_ROOT/* +%{make_install} +%{_fixperms} -c %{buildroot} %check -%{__make} test +make test %files -%doc TODO README -%{perl_vendorlib}/Regexp -%{_mandir}/man3/* +%license COPYRIGHT* +%doc TODO README Changes +%{perl_vendorlib}/Regexp/ +%{_mandir}/man3/Regexp::Common* %changelog +* Sun Sep 22 2019 Paul Howarth - 2017060201-11 +- Tidy up for EPEL-8 build + - Specify all build dependencies + - Expand %%description + - Add patch to fix POD so we get properly-coded manpage + - Modernize spec using %%{make_build} and %%{make_install} + - Make %%files list more explicit + - Use author-independent source URL + * Fri Jul 26 2019 Fedora Release Engineering - 2017060201-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild