From 947257e3ff04e57c40ace753d0bccebe59bdb077db5bbafe566dc48873d69a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 27 Feb 2018 13:07:11 +0000 Subject: [PATCH] Accepting request 580579 from home:kbabioch:branches:shells - Updated to 5.4.2 * The 'exec' and 'command' precommand modifiers, and options to them, are now parsed after parameter expansion. * Functions executed by ZLE widgets no longer have their standard input closed, but redirected from /dev/null instead. * There is an option WARN_NESTED_VAR, a companion to the existing WARN_CREATE_GLOBAL that causes a warning if a function updates a variable from an enclosing scope without using typeset -g. * zmodload now has an option -s to be silent on a failure to find a module but still print other errors. - Dropped patch merged upstream: * fix-patchutils-completion.patch OBS-URL: https://build.opensuse.org/request/show/580579 OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=184 --- fix-patchutils-completion.patch | 29 ----------------------------- zsh-5.3.1.tar.xz | 3 --- zsh-5.3.1.tar.xz.asc | 11 ----------- zsh-5.4.2.tar.gz | 3 +++ zsh-5.4.2.tar.gz.asc | 11 +++++++++++ zsh.changes | 16 ++++++++++++++++ zsh.spec | 10 ++++------ 7 files changed, 34 insertions(+), 49 deletions(-) delete mode 100644 fix-patchutils-completion.patch delete mode 100644 zsh-5.3.1.tar.xz delete mode 100644 zsh-5.3.1.tar.xz.asc create mode 100644 zsh-5.4.2.tar.gz create mode 100644 zsh-5.4.2.tar.gz.asc diff --git a/fix-patchutils-completion.patch b/fix-patchutils-completion.patch deleted file mode 100644 index b12e9fe..0000000 --- a/fix-patchutils-completion.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: zsh-5.3/Completion/Unix/Command/_patchutils -=================================================================== ---- zsh-5.3.orig/Completion/Unix/Command/_patchutils -+++ zsh-5.3/Completion/Unix/Command/_patchutils -@@ -43,6 +43,7 @@ case $service in - '(-F --files)'{-F+,--files=}'[only list files within specified range]:range' - '--strip=[remove specified number of pathname components before displaying]:components' - '--addprefix=[insert specified path prefix before displaying path names]:prefix:_directories' -+ '*:diff file:_files' - ) - ;| - grepdiff|lsdiff) -@@ -58,7 +59,6 @@ case $service in - \*{-v,--verbose}'[verbose operation]' - '(-H --with-filename -h --no-filename)'{-H,--with-filename}'[print the name of the patch file containing each patch]' - '!--filter' '!--grep' -- '*:diff file:_files' - ) - ;; - grepdiff|filterdiff) -@@ -71,7 +71,7 @@ case $service in - '--as-numbered-lines=[display lines of selected hunks]:line numbers:(before after)' - "--remove-timestamps[don't include timestamps in output]" - ) -- ;; -+ ;| - filterdiff) - args+=( - '(-X --exclude-from-file)'{-X+,--exclude-from-file=}'[exclude files matching any pattern listed in specified file]:file:_files' diff --git a/zsh-5.3.1.tar.xz b/zsh-5.3.1.tar.xz deleted file mode 100644 index a8f6d79..0000000 --- a/zsh-5.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da -size 2928832 diff --git a/zsh-5.3.1.tar.xz.asc b/zsh-5.3.1.tar.xz.asc deleted file mode 100644 index 146caf7..0000000 --- a/zsh-5.3.1.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJYWs5TAAoJEKcdmp1L2yezLN8IAM0qkslWUTJAI3UopDxU8syo -FC8rm6asjwM0h8MpgzNBT8HQ9eC2Kg2MNj/BHRQU8ISw4/YJi51I2PMvoF6p8gO1 -7uwk9P3Mo8pSaLsT9J0pwiT0htvxPNX2dZBVHhiOkaZPQVTqqtPkIMlJ2B9NeCzM -TIoJXR143bttES+hyGlC2ltOwLqS/UXn/1ssI+YmkfRjog13gnOfOvJrCodKXQ+Z -l0I5YVthTmgQbhEVKpiHvcAB1/aBZMA0yZSlcL9n9bjpBNqJEhoyaeK9UUgUjd+f -NzRv21v01G02eIsU5kZPc5OQj8a6ONqKSe/TkTP9Jr2PiMQGQPcU5lsH508Fccg= -=39z9 ------END PGP SIGNATURE----- diff --git a/zsh-5.4.2.tar.gz b/zsh-5.4.2.tar.gz new file mode 100644 index 0000000..5f3ff7a --- /dev/null +++ b/zsh-5.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9 +size 4482413 diff --git a/zsh-5.4.2.tar.gz.asc b/zsh-5.4.2.tar.gz.asc new file mode 100644 index 0000000..62cf695 --- /dev/null +++ b/zsh-5.4.2.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABCAAGBQJZoyoaAAoJEKcdmp1L2yezt7AIAJ9D+qiWPJZiXCzi7kBU7hoZ +1+3Nr2QXcXBp2ENDktKFY9zygXQ8m65JqpRHUAYSyKeXsIjCaDLPWHG6HNGN+csg +TxAflLapm/d+53ESNLMju5CeNHkV1pdbEE5LmgmPUpOzHwmV092IYVLsLC5d8CEC +c6hMb2cl8/lWv9S/3WYAAa0gKnmcRLGkyyA4iPoH1BsDGuxQfBfU+Vdh+h1wrq/A ++P81UqvutjM0limDyFGngkJoesuVabRettxR0wA24QBh9mIJxPZLL86QISiVD7a1 +SPkzH88E4vjVtTXEau9TxIHLpukJPIoUNPcfeg+hUdfJ6hkLZdsWxtPRvaXgIEw= +=yDM8 +-----END PGP SIGNATURE----- diff --git a/zsh.changes b/zsh.changes index 434b4f1..b236ada 100644 --- a/zsh.changes +++ b/zsh.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Feb 27 12:21:43 UTC 2018 - kbabioch@suse.com + +- Updated to 5.4.2 + * The 'exec' and 'command' precommand modifiers, and options to + them, are now parsed after parameter expansion. + * Functions executed by ZLE widgets no longer have their standard + input closed, but redirected from /dev/null instead. + * There is an option WARN_NESTED_VAR, a companion to the existing + WARN_CREATE_GLOBAL that causes a warning if a function updates a + variable from an enclosing scope without using typeset -g. + * zmodload now has an option -s to be silent on a failure to find + a module but still print other errors. +- Dropped patch merged upstream: + * fix-patchutils-completion.patch + ------------------------------------------------------------------- Sun Mar 5 14:40:13 UTC 2017 - rpm@fthiessen.de diff --git a/zsh.spec b/zsh.spec index 7202142..6c02c9c 100644 --- a/zsh.spec +++ b/zsh.spec @@ -1,7 +1,7 @@ # # spec file for package zsh # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,14 @@ Name: zsh -Version: 5.3.1 +Version: 5.4.2 Release: 0%{?dist} Summary: Shell with comprehensive completion License: MIT Group: System/Shells Url: http://www.zsh.org -Source0: http://www.zsh.org/pub/zsh-%{version}.tar.xz -Source1: http://www.zsh.org/pub/zsh-%{version}.tar.xz.asc +Source0: http://www.zsh.org/pub/zsh-%{version}.tar.gz +Source1: http://www.zsh.org/pub/zsh-%{version}.tar.gz.asc Source2: %{name}.keyring Source3: zshrc Source4: zshenv @@ -40,7 +40,6 @@ Source16: dotzshrc.rh Patch1: trim-unneeded-completions.patch # PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion Patch2: zsh-osc-completion.patch -Patch3: fix-patchutils-completion.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: groff %if 0%{?suse_version} @@ -100,7 +99,6 @@ This package contains the Zsh manual in html format. %patch1 -p1 %endif %patch2 -p1 -%patch3 -p1 # Remove executable bit chmod 0644 Etc/changelog2html.pl