packages/grep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport grep: migrate to pcre2

Browse Source
This commit is contained in:
licihua 2022-05-14 19:01:04 +08:00
parent 2db0d51b03
commit 9731d93ff0
2 changed files with 1120 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1113
backport-grep-migrate-to-pcre2.patch Normal file
View File

File diff suppressed because it is too large Load Diff

10
grep.spec
View File

@ -1,6 +1,6 @@
Name: grep Name: grep
Version: 3.7 Version: 3.7
Release: 3 Release: 4
Summary: A string search utility Summary: A string search utility
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grep/ URL: http://www.gnu.org/software/grep/
@ -8,8 +8,9 @@ Source0: https://ftp.gnu.org/gnu/grep/grep-%{version}.tar.xz
Patch1: backport-grep-avoid-sticky-problem-with-f-f.patch Patch1: backport-grep-avoid-sticky-problem-with-f-f.patch
Patch2: backport-grep-s-does-not-suppress-binary-file-matches.patch Patch2: backport-grep-s-does-not-suppress-binary-file-matches.patch
Patch3: backport-grep-migrate-to-pcre2.patch
BuildRequires: gcc pcre-devel >= 3.9-10 texinfo gettext libsigsegv-devel automake BuildRequires: gcc pcre2-devel texinfo gettext libsigsegv-devel automake
Provides: /bin/egrep /bin/fgrep /bin/grep bundled(gnulib) Provides: /bin/egrep /bin/fgrep /bin/grep bundled(gnulib)
%description %description
@ -21,7 +22,7 @@ a specified pattern. By default, Grep outputs the matching lines.
%build %build
%configure --disable-silent-rules \ %configure --disable-silent-rules \
CPPFLAGS="-I%{_includedir}/pcre" CFLAGS="$RPM_OPT_FLAGS -fsigned-char" CPPFLAGS="-I%{_includedir}/pcre2" CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
%make_build %make_build
%install %install
@ -47,6 +48,9 @@ make check
%changelog %changelog
* Sat May 14 2022 licihua <licihua@huawei.com> -3.7-4
- Modify the dependency from pcre to pcre2
* Fri Mar 18 2022 yangzhuangzhuang <yangzhuangzhuang1@h-partners.com> - 3.7-3 * Fri Mar 18 2022 yangzhuangzhuang <yangzhuangzhuang1@h-partners.com> - 3.7-3
- The -s option no longer suppresses "binary file matches" messages - The -s option no longer suppresses "binary file matches" messages