Add gnulib patch to fix FTBFS with perl 5.22
This commit is contained in:
parent
1386273667
commit
498ee4a5ac
11
grep-2.21-gnulib.patch
Normal file
11
grep-2.21-gnulib.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- grep-2.21/build-aux/update-copyright.orig 2015-08-02 18:10:29.174256966 +0100
|
||||
+++ grep-2.21/build-aux/update-copyright 2015-08-02 18:11:19.926287054 +0100
|
||||
@@ -124,7 +124,7 @@
|
||||
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;
|
@ -22,6 +22,8 @@ Patch2: grep-2.21-buf-overrun-fix.patch
|
||||
# backported from upstream
|
||||
# http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6
|
||||
Patch3: grep-2.21-recurse-behaviour-change-doc.patch
|
||||
# http://www.mail-archive.com/bug-gnulib%40gnu.org/msg31638.html
|
||||
Patch4: grep-2.21-gnulib.patch
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
|
||||
@ -43,6 +45,7 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
|
||||
%patch1 -p1 -b .help-align
|
||||
%patch2 -p1 -b .buf-overrun-fix
|
||||
%patch3 -p1 -b .recurse-behaviour-change-doc
|
||||
%patch4 -p1 -b .gnulib
|
||||
|
||||
chmod 755 tests/kwset-abuse
|
||||
|
||||
@ -98,6 +101,7 @@ fi
|
||||
* Sun Aug 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.21-7
|
||||
- Minor spec cleanups and modifications
|
||||
- Drop Changelog, details in NEWS
|
||||
- Add gnulib patch to fix FTBFS with perl 5.22
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.21-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user