From 737d982d056f7bf5eab35b37bcd068745c63ebac30da174137c42fd358b6ef02 Mon Sep 17 00:00:00 2001 From: Paolo Perego Date: Tue, 13 Sep 2022 08:12:36 +0000 Subject: [PATCH] Accepting request 1002958 from home:dirkmueller:Factory - add egrep-deprecation.patch (bsc#1203241) OBS-URL: https://build.opensuse.org/request/show/1002958 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=236 --- egrep-deprecation.patch | 26 ++++++++++++++++++++++++++ zsh.changes | 5 +++++ zsh.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 egrep-deprecation.patch diff --git a/egrep-deprecation.patch b/egrep-deprecation.patch new file mode 100644 index 0000000..463f6e3 --- /dev/null +++ b/egrep-deprecation.patch @@ -0,0 +1,26 @@ +Index: zsh-5.9/Test/D07multibyte.ztst +=================================================================== +--- zsh-5.9.orig/Test/D07multibyte.ztst ++++ zsh-5.9/Test/D07multibyte.ztst +@@ -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')) ++ ${(M)$(locale -a 2>/dev/null):#*.(utf8|UTF-8)} ) + for LANG in $langs; do + if [[ é = ? ]]; then + mb_ok=1 +Index: zsh-5.9/Test/E01options.ztst +=================================================================== +--- zsh-5.9.orig/Test/E01options.ztst ++++ zsh-5.9/Test/E01options.ztst +@@ -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 --git a/zsh.changes b/zsh.changes index 8b92759..fcd04ac 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 12 13:03:37 UTC 2022 - Dirk Müller + +- add egrep-deprecation.patch (bsc#1203241) + ------------------------------------------------------------------- Sun May 15 17:44:40 UTC 2022 - Dirk Müller diff --git a/zsh.spec b/zsh.spec index e5a30aa..bb370ab 100644 --- a/zsh.spec +++ b/zsh.spec @@ -40,6 +40,8 @@ Source5: zprofile Patch1: trim-unneeded-completions.patch # PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion Patch2: zsh-osc-completion.patch +# PATCH-FIX-OPENSUSE: taken from https://www.zsh.org/mla/workers/2022/msg00956.html +Patch3: egrep-deprecation.patch BuildRequires: groff BuildRequires: libcap-devel BuildRequires: ncurses-devel @@ -99,6 +101,7 @@ This package contains the Zsh manual in HTML format. %patch1 -p1 %endif %patch2 -p1 +%patch3 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl