pool/zsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1002958 from home:dirkmueller:Factory

Browse Source 
- 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
This commit is contained in:
Paolo Perego 2022-09-13 08:12:36 +00:00 committed by Git OBS Bridge
parent 1a585898c8
commit 737d982d05
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
egrep-deprecation.patch Normal file
View File

@ -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

5
zsh.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 12 13:03:37 UTC 2022 - Dirk Müller <dmueller@suse.com>
- add egrep-deprecation.patch (bsc#1203241)
-------------------------------------------------------------------
Sun May 15 17:44:40 UTC 2022 - Dirk Müller <dmueller@suse.com>

3
zsh.spec
View File

@ -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