From 28d308524d0eeeaa0113ff4f4735aca6a005b70f8234b1934a4eae78faec0503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 21 Apr 2011 17:48:17 +0000
Subject: [PATCH] Fix patch tag

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=61
---
 ....3.6-hack-a01grammar-test-select-off.patch | 32 -------------------
 zsh.spec                                      |  3 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 zsh-4.3.6-hack-a01grammar-test-select-off.patch

diff --git a/zsh-4.3.6-hack-a01grammar-test-select-off.patch b/zsh-4.3.6-hack-a01grammar-test-select-off.patch
deleted file mode 100644
index 41acd64..0000000
--- a/zsh-4.3.6-hack-a01grammar-test-select-off.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru zsh-4.3.6-orig/Test/A01grammar.ztst zsh-4.3.6/Test/A01grammar.ztst
---- zsh-4.3.6-orig/Test/A01grammar.ztst	2007-12-11 09:47:54.000000000 -0500
-+++ zsh-4.3.6/Test/A01grammar.ztst	2008-08-26 01:01:57.000000000 -0400
-@@ -250,16 +250,17 @@
- 
- ## Select now reads from stdin if the shell is not interactive.
- ## Its own output goes to stderr.
--  (COLUMNS=80
--  PS3="input> "
--  select name in one two three; do
--    print $name
--  done)
--0:`select' loop
--<2
--?1) one     2) two     3) three   
--?input> input> 
-->two
-+# FIXME: This seems to be racy under mock ... is it zsh, or mock, or kernel?
-+#  (COLUMNS=80
-+#  PS3="input> "
-+#  select name in one two three; do
-+#    print $name
-+#  done)
-+#0:`select' loop
-+#<2
-+#?1) one     2) two     3) three   
-+#?input> input> 
-+#>two
- 
-   function name1 name2 () { print This is $0; }
-   name2
-Only in zsh-4.3.6/Test: A01grammar.ztst~
diff --git a/zsh.spec b/zsh.spec
index c456a03..e4047fa 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -37,8 +37,7 @@ Patch0:         %{name}-4.3.11-doc_makefile.patch
 Patch1:         %{name}-4.3.11-doc_intro_paths.patch
 Patch2:         %{name}-4.3.11-run-help_pager.patch
 Patch3:         zsh-cleanup.patch
-# PATCH-FIX-OPENSUSE zsh-4.3.6-hack-a01grammar-test-select-off.patch idoenmez@suse.de -- Disable racy test
-#Patch4:         zsh-4.3.6-hack-a01grammar-test-select-off.patch
+# PATCH-FIX-UPSTREAM zzsh-4.3.11-fix-a01grammar.patch idoenmez@suse.de -- Fix lines output
 Patch4:		zsh-4.3.11-fix-a01grammar.patch
 BuildRequires:  fdupes
 BuildRequires:  libcap-devel