diff options
| author | Vitezslav Crhonek <vcrhonek@redhat.com> | 2015-07-13 11:54:35 +0200 |
|---|---|---|
| committer | Vitezslav Crhonek <vcrhonek@redhat.com> | 2015-07-13 11:54:35 +0200 |
| commit | 0ace43e0b89cf93d42c60aaae9e635a2b5903e47 (patch) | |
| tree | d73f23c5aee70b3af520c4ae0e79d323e2575378 | |
| parent | 5e14a5e2996aad07a80af2030cb10ccbf9e32866 (diff) | |
| download | m4-0ace43e0b89cf93d42c60aaae9e635a2b5903e47.tar.gz m4-0ace43e0b89cf93d42c60aaae9e635a2b5903e47.tar.xz m4-0ace43e0b89cf93d42c60aaae9e635a2b5903e47.zip | |
Fix m4 FTBFS in rawhide
| -rw-r--r-- | m4-1.4.17-perl-make-check.patch | 12 | ||||
| -rw-r--r-- | m4.spec | 9 |
2 files changed, 20 insertions, 1 deletions
diff --git a/m4-1.4.17-perl-make-check.patch b/m4-1.4.17-perl-make-check.patch new file mode 100644 index 0000000..ae4af40 --- /dev/null +++ b/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; @@ -1,7 +1,7 @@ Summary: The GNU macro processor Name: m4 Version: 1.4.17 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ Group: Applications/Text Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz @@ -10,6 +10,8 @@ URL: http://www.gnu.org/software/m4/ # Patch0: Fixes math tests for little-endian PowerPC, rhbz#1083434 # patch by Menanteau Guy and Ulrich Weigand Patch0: m4-1.4.17-gnulib-ppc64le.patch +# Patch1: Fixes FTBFS, already upstream +Patch1: m4-1.4.17-perl-make-check.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info BuildRequires: autoconf automake @@ -33,6 +35,7 @@ Install m4 if you need a macro processor. %prep %setup -q %patch0 -p1 -b .gnulib-ppc64le +%patch1 -p1 -b .perl-make-check chmod 644 COPYING %build @@ -66,6 +69,10 @@ if [ "$1" = 0 ]; then fi %changelog +* Mon Jul 13 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.4.17-8 +- Fix m4 FTBFS in rawhide + Resolves: #1239665 + * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.17-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild |