Accepting request 315187 from home:coolo:branches:openSUSE:Factory
- add gnulib-perl522.patch from gnulib.bugs OBS-URL: https://build.opensuse.org/request/show/315187 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=60
This commit is contained in:
parent
0bfdea05de
commit
8e2acdccba
15
gnulib-perl522.patch
Normal file
15
gnulib-perl522.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
Subject: http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272
|
||||||
|
|
||||||
|
Index: grep-2.21/build-aux/update-copyright
|
||||||
|
===================================================================
|
||||||
|
--- grep-2.21.orig/build-aux/update-copyright
|
||||||
|
+++ grep-2.21/build-aux/update-copyright
|
||||||
|
@@ -124,7 +124,7 @@ use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
my $copyright_re = 'Copyright';
|
||||||
|
-my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
|
||||||
|
+my $circle_c_re = '(?:\([cC]\)|@copyright\{}|©)';
|
||||||
|
my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
|
||||||
|
$holder ||= 'Free Software Foundation, Inc.';
|
||||||
|
my $prefix_max = 5;
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 6 10:10:12 UTC 2015 - coolo@suse.com
|
||||||
|
|
||||||
|
- add gnulib-perl522.patch from gnulib.bugs
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 26 10:46:13 UTC 2015 - schwab@suse.de
|
Mon Jan 26 10:46:13 UTC 2015 - schwab@suse.de
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
|||||||
Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
|
Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
|
||||||
Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring
|
Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring
|
||||||
Patch0: grep-F-heap-overrun.patch
|
Patch0: grep-F-heap-overrun.patch
|
||||||
|
# PATCH-FIX-UPSTREAM http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272
|
||||||
|
Patch1: gnulib-perl522.patch
|
||||||
BuildRequires: makeinfo
|
BuildRequires: makeinfo
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: xz
|
BuildRequires: xz
|
||||||
@ -45,6 +47,7 @@ the matching lines.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
chmod +x tests/kwset-abuse
|
chmod +x tests/kwset-abuse
|
||||||
%if 0%{?suse_version} < 1120
|
%if 0%{?suse_version} < 1120
|
||||||
echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache
|
echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache
|
||||||
|
Loading…
Reference in New Issue
Block a user