Accepting request 150181 from shells

- Fix zypper completion [bnc#752112]
  * zsh-zypper-completion.patch
- Fix osc completion
  * zsh-osc-suseversion.patch (forwarded request 150103 from Dmitry_R)

OBS-URL: https://build.opensuse.org/request/show/150181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zsh?expand=0&rev=48

zsh-osc-suseversion.patch

@@ -0,0 +1,15 @@
+Index: zsh/Completion/openSUSE/Command/_osc
+===================================================================
+--- zsh.orig/Completion/openSUSE/Command/_osc
++++ zsh/Completion/openSUSE/Command/_osc
+@@ -16,8 +16,8 @@
+ # version 0.2
+ #
+ 
+-OSC_BUILD_TARGETS="openSUSE_11.2 openSUSE_11.3 openSUSE_11.4 openSUSE_12.1 openSUSE_Tumbleweed openSUSE_Factory SLE_11_SP1"
+-OSC_PROJECTS="openSUSE:Factory openSUSE:Tumbleweed openSUSE:12.1 openSUSE:11.4 openSUSE:11.2 openSUSE:11.3"
++OSC_BUILD_TARGETS="openSUSE_12.1 openSUSE_12.2 openSUSE_12.3 openSUSE_Tumbleweed openSUSE_Factory SLE_11_SP2"
++OSC_PROJECTS="openSUSE:Factory openSUSE:Tumbleweed openSUSE:12.3 openSUSE:12.2 openSUSE:12.1"
+ 
+ # user defined variables $OSC_BUILD_TARGETS_EXTRA and
+ # $OSC_PROJECTS_EXTRA can add to the project/build target list

zsh-zypper-completion.patch

@@ -0,0 +1,26 @@
+Index: zsh/Completion/openSUSE/Command/_zypper
+===================================================================
+--- zsh.orig/Completion/openSUSE/Command/_zypper
++++ zsh/Completion/openSUSE/Command/_zypper
+@@ -28,11 +28,10 @@ _zypper() {
+ 	local hline
+ 	local -a cmdlist
+ 	local tag=0
+-	_call_program help-commands zypper help | while read -A hline; do
++	_call_program help-commands LANG=C zypper help | sed -e ':a;N;$!ba;s/\n\t\t\t\t/ /g' | while read -A hline; do
+ 	    # start parsing with "Global Options:"
+ 	    [[ $hline =~ "^Global Options:" ]] && tag=1
+ 	    [[ $tag = 0 ]] && continue
+-	    [[ $hline[1] =~ ^\t\t\t\t ]] && continue
+ 	    # all commands have to start with lower case letters
+ 	    [[ $hline[1] =~ ^[A-Z] ]] && continue
+ 	    (( ${#hline} < 2 )) && continue
+@@ -51,7 +50,7 @@ _zypper_cmd_do() {
+     local hline
+     local -a cmdlist
+     local tag=0
+-    _call_program help-commands zypper help $cmd | while read -A hline; do
++    _call_program help-commands LANG=C zypper help $cmd | while read -A hline; do
+ 	# start parsing from "Options:"
+ 	[[ $hline =~ "^Command options:" ]] && tag=1
+ 	[[ $tag = 0 ]] && continue

zsh.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jan 27 20:53:10 UTC 2013 - dmitry_r@opensuse.org
+
+- Fix zypper completion [bnc#752112]
+  * zsh-zypper-completion.patch
+- Fix osc completion (SUSE versions)
+  * zsh-osc-suseversion.patch
+
 -------------------------------------------------------------------
 Mon Dec 24 15:53:42 UTC 2012 - idonmez@suse.com
 

zsh.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package zsh
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,8 @@ Source15:       zshenv.rhs
 Source16:       dotzshrc.rh
 Source17:       zshprompt.pl
 %endif
+Patch1:         zsh-zypper-completion.patch
+Patch2:         zsh-osc-suseversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 Requires(pre):  %{install_info_prereq}
@@ -91,6 +93,8 @@ This package contains the Zsh manual in html format.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1
+%patch2 -p1
 
 # Remove executable bit
 chmod 0644 Etc/changelog2html.pl