diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-08-12 12:23:47 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-08-12 12:23:47 +0200 |
| commit | 94ea7f45be99f8bb9b6c67bec7af98f721187e11 (patch) | |
| tree | 85db05b2bf885a4781335da2452353a1d3bca32c | |
| parent | fbd075a5fc8f17ec244b5f7051374b319f0b77e1 (diff) | |
| download | scl-autotools-94ea7f45be99f8bb9b6c67bec7af98f721187e11.tar.gz scl-autotools-94ea7f45be99f8bb9b6c67bec7af98f721187e11.tar.xz scl-autotools-94ea7f45be99f8bb9b6c67bec7af98f721187e11.zip | |
latest/m4: fix FTBFS with new perl
| -rw-r--r-- | repos/autotools/autotools-latest/m4/m4-1.4.17-perl-make-check.patch | 12 | ||||
| -rw-r--r-- | repos/autotools/autotools-latest/m4/m4.spec | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/repos/autotools/autotools-latest/m4/m4-1.4.17-perl-make-check.patch b/repos/autotools/autotools-latest/m4/m4-1.4.17-perl-make-check.patch new file mode 100644 index 0000000..ae4af40 --- /dev/null +++ b/repos/autotools/autotools-latest/m4/m4-1.4.17-perl-make-check.patch @@ -0,0 +1,12 @@ +diff -up m4-1.4.17/build-aux/update-copyright.orig m4-1.4.17/build-aux/update-copyright +--- m4-1.4.17/build-aux/update-copyright.orig 2015-07-13 11:25:19.502749690 +0200 ++++ m4-1.4.17/build-aux/update-copyright 2015-07-13 11:26:20.445044297 +0200 +@@ -124,7 +124,7 @@ use strict; + use warnings; + + my $copyright_re = 'Copyright'; +-my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)'; ++my $circle_c_re = '(?:\([cC]\)|@copyright\{}|\\\\\(co|©)'; + my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; + $holder ||= 'Free Software Foundation, Inc.'; + my $prefix_max = 5; diff --git a/repos/autotools/autotools-latest/m4/m4.spec b/repos/autotools/autotools-latest/m4/m4.spec index e9e126d..48eb5b8 100644 --- a/repos/autotools/autotools-latest/m4/m4.spec +++ b/repos/autotools/autotools-latest/m4/m4.spec @@ -7,12 +7,14 @@ Summary: The GNU macro processor Name: %{scl_prefix}m4 Version: 1.4.17 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: Applications/Text Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.gz Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.gz.sig URL: http://www.gnu.org/software/m4/ +# Patch1: Fixes FTBFS, already upstream +Patch1: m4-1.4.17-perl-make-check.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %ifarch ppc ppc64 @@ -46,6 +48,7 @@ Install m4 if you need a macro processor. %prep %setup -q -n m4-%{version} +%patch1 -p1 -b .perl-make-check chmod 644 COPYING %build @@ -79,6 +82,9 @@ fi %changelog +* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.4.17-4 +- ftbfs with new perl (rhbz#1239665) + * Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 1.4.17-3 - use _compat_el5_build only if defined (rhbz#1252751) |