diff --git a/.gitignore b/.gitignore index 87e7d8c..500eb21 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ filter-requires.sh /perl-5.18.2.tar.bz2 /perl-5.20.0.tar.bz2 /perl-5.20.1.tar.bz2 +/perl-5.20.2.tar.bz2 diff --git a/perl.spec b/perl.spec index 05d155d..3ad2eee 100644 --- a/perl.spec +++ b/perl.spec @@ -1,4 +1,4 @@ -%global perl_version 5.20.1 +%global perl_version 5.20.2 %global perl_epoch 4 %global perl_arch_stem -thread-multi %global perl_archname %{_arch}-%{_os}%{perl_arch_stem} @@ -30,7 +30,7 @@ Name: perl Version: %{perl_version} # release number must be even higher, because dual-lived modules will be broken otherwise -Release: 319%{?dist} +Release: 320%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -124,9 +124,12 @@ BuildRequires: groff-base BuildRequires: libdb-devel, tcsh, zlib-devel, bzip2-devel BuildRequires: systemtap-sdt-devel %if %{with gdbm} -BuildRequires: gdbm-devel +BuildRequires: gdbm-devel %endif +# Regenerate a2p.c bug #1177672 +BuildRequires: byacc + # For tests BuildRequires: procps, rsyslog @@ -1355,7 +1358,7 @@ Summary: What modules are shipped with versions of perl Group: Development/Libraries License: GPL+ or Artistic Epoch: 1 -Version: 5.020001 +Version: 5.20150214 Requires: %perl_compat Requires: perl(List::Util) Requires: perl(version) >= 0.88 @@ -2093,6 +2096,12 @@ rm -rf 'cpan/Memoize/Memoize/NDBM_File.pm' sed -i '\|cpan/Memoize/Memoize/NDBM_File.pm|d' MANIFEST %endif +# Regenerate a2p.c bug #1177672 +pushd x2p +yacc a2p.y +mv -f y.tab.c a2p.c +popd + %build echo "RPM Build arch: %{_arch}" @@ -3853,6 +3862,11 @@ sed \ # Old changelog entries are preserved in CVS. %changelog +* Tue Feb 17 2015 Jitka Plesnikova - 4:5.20.2-320 +- 5.20.2 bump (see + for release notes) +- Regenerate a2p.c (BZ#1177672) + * Mon Feb 16 2015 Petr Pisar - 4:5.20.1-319 - Improve h2ph fix for GCC 5.0 diff --git a/sources b/sources index 16ffb67..c0557ea 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ aceea3db13a159cd5f7e5f2e3ad9534f perl-5.8.0-libdir64.patch ad5d07285d6e4914384b43c9abc2bdba filter-requires.sh 93b780a770906408a34b1c511e333a12 perl.stp 735480c6749c2aa86faa8311fe651142 perl-example.stp -ede5166f949d9a07163bc5b086be9759 perl-5.20.1.tar.bz2 +21062666f1c627aeb6dbff3c6952738b perl-5.20.2.tar.bz2