diff --git a/perl-re-engine-RE2.spec b/perl-re-engine-RE2.spec index 26d4164..46e04a6 100644 --- a/perl-re-engine-RE2.spec +++ b/perl-re-engine-RE2.spec @@ -1,7 +1,7 @@ -Name: perl-re-engine-RE2 -Summary: RE2 regex engine -Version: 0.13 -Release: 25%{?dist} +Name: perl-re-engine-RE2 +Summary: RE2 regex engine +Version: 0.13 +Release: 26%{?dist} # lib/re/engine/RE2.pm: GPL+ or Artistic # ppport.h: GPL+ or Artistic # README: GPL+ or Artistic @@ -13,79 +13,77 @@ Release: 25%{?dist} # re2/util/strutil.cc: BSD # re2/util/utf.h: MIT # re2/util/valgrind.h: BSD -License: GPL+ or Artistic -URL: https://metacpan.org/release/re-engine-RE2 -Source0: https://cpan.metacpan.org/authors/id/D/DG/DGL/re-engine-RE2-%{version}.tar.gz - -# Discussion started with upstream at: -# https://rt.cpan.org/Public/Bug/Display.html?id=83467 -Patch0: re-engine-RE2-0.11-Unbundle-re2.patch +License: GPL+ or Artistic +URL: https://metacpan.org/release/re-engine-RE2 +Source0: https://cpan.metacpan.org/authors/id/D/DG/DGL/re-engine-RE2-%{version}.tar.gz +# Discussion started with upstream at +# +Patch0: re-engine-RE2-0.11-Unbundle-re2.patch # Do not use global $_ in "my" (CPAN RT#108357) -Patch1: re-engine-RE2-0.13-Do-not-use-global-in-my.patch +Patch1: re-engine-RE2-0.13-Do-not-use-global-in-my.patch # Fix 01.basic.t for v5.29.9 Variable length lookbehind support (CPAN RT#129585) -Patch2: re-engine-RE2-0.13-Fix-01-basic.t-for-Variable-length-lookbehind-support.patch - -BuildRequires: coreutils -BuildRequires: findutils -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: make -BuildRequires: perl-interpreter -BuildRequires: perl-devel -BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::CppGuess) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(XSLoader) -BuildRequires: perl(Test::More) -BuildRequires: re2-devel - -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Patch2: re-engine-RE2-0.13-Fix-01-basic.t-for-Variable-length-lookbehind-support.patch +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: make +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(:VERSION) >= 5.12 +BuildRequires: perl(Config) +BuildRequires: perl(ExtUtils::CppGuess) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +BuildRequires: re2-devel +# Run-time: +BuildRequires: perl(XSLoader) +# Tests: +BuildRequires: perl(Test::More) >= 0.88 +BuildRequires: perl(utf8) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %{?perl_default_filter} %description This module replaces perl's regex engine in a given lexical scope with RE2. - %prep %setup -q -n re-engine-RE2-%{version} - -# Remove incorrect executable bits -chmod -x lib/re/engine/RE2.pm - -# Just to be sure we don't build against the bundled version -rm -fr re2 - +# Removed bundled RE2 %patch0 -p1 +rm -fr re2 +# Other fixes %patch1 -p1 %patch2 -p1 +# Remove incorrect executable bits +chmod -x lib/re/engine/RE2.pm %build -perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" -make %{?_smp_mflags} - +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="%{optflags}" +%{make_build} %install -make pure_install DESTDIR=%{buildroot} - -find %{buildroot} -type f -name .packlist -delete +%{make_install} find %{buildroot} -type f -name '*.bs' -size 0 -delete - %{_fixperms} %{buildroot}/* - %check +unset AUTOMATED_TESTING PERL5_CPANM_IS_RUNNING make test - %files -%doc Changes README +%doc Changes README TODO %{perl_vendorarch}/auto/* %{perl_vendorarch}/re* %{_mandir}/man3/* - %changelog +* Fri Mar 12 2021 Petr Pisar - 0.13-26 +- Modernize a spec file + * Wed Jan 27 2021 Fedora Release Engineering - 0.13-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild