rpms/grep
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add gnulib patch to fix FTBFS with perl 5.22

Browse Source
This commit is contained in:
Peter Robinson 2015-08-02 18:21:48 +01:00
parent 1386273667
commit 498ee4a5ac
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
grep-2.21-gnulib.patch Normal file
View 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;

4
grep.spec
View File

@ -22,6 +22,8 @@ Patch2: grep-2.21-buf-overrun-fix.patch
# backported from upstream # backported from upstream
# http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6 # http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6
Patch3: grep-2.21-recurse-behaviour-change-doc.patch 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(post): /sbin/install-info
Requires(preun): /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 %patch1 -p1 -b .help-align
%patch2 -p1 -b .buf-overrun-fix %patch2 -p1 -b .buf-overrun-fix
%patch3 -p1 -b .recurse-behaviour-change-doc %patch3 -p1 -b .recurse-behaviour-change-doc
%patch4 -p1 -b .gnulib
chmod 755 tests/kwset-abuse chmod 755 tests/kwset-abuse
@ -98,6 +101,7 @@ fi
* Sun Aug 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.21-7 * Sun Aug 2 2015 Peter Robinson <pbrobinson@fedoraproject.org> 2.21-7
- Minor spec cleanups and modifications - Minor spec cleanups and modifications
- Drop Changelog, details in NEWS - 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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild