From d788b481cfcd3cd813252488c6b8de371114744b Mon Sep 17 00:00:00 2001
From: Cao Jingbo <caojb@chinatelecom.cn>
Date: Mon, 30 Jan 2023 17:17:06 +0800
Subject: [PATCH] Fix build with grep-3.8 test error

Signed-off-by: Cao Jingbo <caojb@chinatelecom.cn>
---
 zsh-5.9-fix-egrep-test-error.patch | 72 ++++++++++++++++++++++++++++++
 zsh.spec                           |  6 ++-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 zsh-5.9-fix-egrep-test-error.patch

diff --git a/zsh-5.9-fix-egrep-test-error.patch b/zsh-5.9-fix-egrep-test-error.patch
new file mode 100644
index 0000000..3d3c1d3
--- /dev/null
+++ b/zsh-5.9-fix-egrep-test-error.patch
@@ -0,0 +1,72 @@
+diff -Naur a/Test/D07multibyte.ztst b/Test/D07multibyte.ztst
+--- a/Test/D07multibyte.ztst	2022-05-08 14:18:22.000000000 +0800
++++ b/Test/D07multibyte.ztst	2023-01-30 16:26:37.480018635 +0800
+@@ -6,7 +6,7 @@
+   unset -m LC_\*
+   mb_ok=
+   langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
++	 $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8'))
+   for LANG in $langs; do
+     if [[ é = ? ]]; then
+       mb_ok=1
+diff -Naur a/Test/E01options.ztst b/Test/E01options.ztst
+--- a/Test/E01options.ztst	2022-05-08 14:18:22.000000000 +0800
++++ b/Test/E01options.ztst	2023-01-30 16:26:37.481018640 +0800
+@@ -651,7 +651,7 @@
+ >noktarg1
+ >0 1
+ 
+-  showopt() { setopt | egrep 'localoptions|ksharrays'; }
++  showopt() { setopt | grep -E 'localoptions|ksharrays'; }
+   f1() { setopt localoptions ksharrays; showopt }
+   f2() { setopt ksharrays; showopt }
+   setopt kshoptionprint
+diff -Naur a/Test/V07pcre.ztst b/Test/V07pcre.ztst
+--- a/Test/V07pcre.ztst	2022-05-08 14:18:22.000000000 +0800
++++ b/Test/V07pcre.ztst	2023-01-30 16:26:37.488018676 +0800
+@@ -12,7 +12,7 @@
+   unset -m LC_\*
+   mb_ok=
+   langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
++	 $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8'))
+   for LANG in $langs; do
+     if [[ é = ? ]]; then
+       mb_ok=1
+diff -Naur a/Test/X02zlevi.ztst b/Test/X02zlevi.ztst
+--- a/Test/X02zlevi.ztst	2022-05-08 14:18:22.000000000 +0800
++++ b/Test/X02zlevi.ztst	2023-01-30 16:26:37.492018696 +0800
+@@ -4,7 +4,7 @@
+   unset -m LC_\*
+   ZSH_TEST_LANG=
+   langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
++	 $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8'))
+   for LANG in $langs; do
+     if [[ é = ? ]]; then
+       ZSH_TEST_LANG=$LANG 
+diff -Naur a/Test/X03zlebindkey.ztst b/Test/X03zlebindkey.ztst
+--- a/Test/X03zlebindkey.ztst	2022-05-08 14:18:22.000000000 +0800
++++ b/Test/X03zlebindkey.ztst	2023-01-30 16:26:37.492018696 +0800
+@@ -6,7 +6,7 @@
+   unset -m LC_\*
+   ZSH_TEST_LANG=
+   langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-	 $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
++	 $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8'))
+   for LANG in $langs; do
+     if [[ é = ? ]]; then
+       ZSH_TEST_LANG=$LANG
+diff -Naur a/Test/Y01completion.ztst b/Test/Y01completion.ztst
+--- a/Test/Y01completion.ztst	2022-05-08 14:18:22.000000000 +0800
++++ b/Test/Y01completion.ztst	2023-01-30 16:26:37.493018701 +0800
+@@ -4,7 +4,7 @@
+   unset -m LC_\*
+   ZSH_TEST_LANG=
+   langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
+-         $(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
++         $(locale -a 2>/dev/null | grep -E 'utf8|UTF-8'))
+   for LANG in $langs; do
+     if [[ é = ? ]]; then
+       ZSH_TEST_LANG=$LANG
diff --git a/zsh.spec b/zsh.spec
index 04750cd..52336a6 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -2,7 +2,7 @@
 
 Name:                 zsh
 Version:              5.9
-Release:              2
+Release:              3
 Summary:              A shell designed for interactive use
 License:              MIT
 URL:                  http://zsh.sourceforge.net
@@ -16,6 +16,7 @@ Source3:              zprofile
 Source4:              zshrc
 Source5:              zshenv
 Source6:              dotzshrc
+Patch0:               zsh-5.9-fix-egrep-test-error.patch
 
 BuildRequires:        autoconf coreutils gawk gdbm-devel libcap-devel make
 BuildRequires:        ncurses-devel pcre-devel sed texinfo hostname gcc
@@ -128,6 +129,9 @@ fi
 %{_infodir}/*
 
 %changelog
+* Mon Jan 30 2023 Cao Jingbo <caojb@chinatelecom.cn> - 5.9-3
+- Fix when use grep 3.8 build error.
+
 * Tue Jan 17 2023 dillon chen < dillon.chen@gmail.com> - 5.9-2
 - /usr/local/bin/zsh => /bin/zsh