From b0eb86fe996f26d3227d9d413b714b966f81df108ec7f81a5f7afb9536886eb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 30 Nov 2011 21:53:20 +0000
Subject: [PATCH] - Update to zsh 4.2.13   * See included ChangeLog for details
 - Drop zsh-4.3.12-ksh-emulation-syntax-checking.patch,   fixed upstream

OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=82
---
 zsh-4.3.12-ksh-emulation-syntax-checking.patch | 15 ---------------
 zsh-4.3.12-test-3.tar.bz2                      |  3 ---
 zsh-4.3.13.tar.bz2                             |  3 +++
 zsh.changes                                    |  8 ++++++++
 zsh.spec                                       |  9 +++------
 5 files changed, 14 insertions(+), 24 deletions(-)
 delete mode 100644 zsh-4.3.12-ksh-emulation-syntax-checking.patch
 delete mode 100644 zsh-4.3.12-test-3.tar.bz2
 create mode 100644 zsh-4.3.13.tar.bz2

diff --git a/zsh-4.3.12-ksh-emulation-syntax-checking.patch b/zsh-4.3.12-ksh-emulation-syntax-checking.patch
deleted file mode 100644
index 1eb08b2..0000000
--- a/zsh-4.3.12-ksh-emulation-syntax-checking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN zsh-4.3.12-orig/Src/subst.c zsh-4.3.12/Src/subst.c
---- zsh-4.3.12-orig/Src/subst.c	2011-05-23 18:48:19.000000000 +0200
-+++ zsh-4.3.12/Src/subst.c	2011-06-29 13:44:13.000000000 +0200
-@@ -245,7 +245,10 @@
- 	    if (endchar == Outpar && str2[1] == '(' && str[-2] == ')') {
- 		/* Math substitution of the form $((...)) */
- 		str[-2] = '\0';
--		str = arithsubst(str2 + 2, &str3, str);
-+		if (isset(EXECOPT))
-+		    str = arithsubst(str2 + 2, &str3, str);
-+		else
-+		    strncpy(str3, str2, 1);
- 		setdata(node, (void *) str3);
- 		continue;
- 	    }
diff --git a/zsh-4.3.12-test-3.tar.bz2 b/zsh-4.3.12-test-3.tar.bz2
deleted file mode 100644
index d22e2ad..0000000
--- a/zsh-4.3.12-test-3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47bd04cb35933d2a9d70fb8301f7dc08e55da4a80f4f79c7d70a9423d617aa11
-size 2965438
diff --git a/zsh-4.3.13.tar.bz2 b/zsh-4.3.13.tar.bz2
new file mode 100644
index 0000000..433b55d
--- /dev/null
+++ b/zsh-4.3.13.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:173bafa9f363050de40c50492eccbd8c55d85401a42b076b2178c2d9d5355d9c
+size 2964918
diff --git a/zsh.changes b/zsh.changes
index 4a29869..d811f01 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov 30 21:49:26 UTC 2011 - idoenmez@suse.de
+
+- Update to zsh 4.2.13
+  * See included ChangeLog for details
+- Drop zsh-4.3.12-ksh-emulation-syntax-checking.patch, 
+  fixed upstream
+
 -------------------------------------------------------------------
 Tue Nov 29 14:19:04 UTC 2011 - idoenmez@suse.de
 
diff --git a/zsh.spec b/zsh.spec
index 39456f9..e25ba28 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -18,7 +18,7 @@
 
 
 Name:           zsh
-Version:        4.3.12+test3
+Version:        4.3.13
 Release:        4
 License:        BSD
 Summary:        Shell with comprehensive completion
@@ -28,7 +28,7 @@ Group:          System/Shells
 %else
 Group:          System Environment/Shells
 %endif
-Source0:        ftp://ftp.zsh.org/pub/development/zsh-4.3.12-test-3.tar.bz2
+Source0:        ftp://ftp.zsh.org/pub/zsh-%{version}.tar.bz2
 Source1:        zshrc
 Source2:        zshenv
 Source3:        zprofile
@@ -42,8 +42,6 @@ Source16:       dotzshrc.rh
 Source17:       zshprompt.pl
 %endif
 Patch1:         %{name}-4.3.12-disable-c02cond-test.patch
-# PATCH-FIX ksh-emulation-syntax-checking.patch -- Import and rework from RHEL (zsh-4.2.6)
-Patch2:         %{name}-4.3.12-ksh-emulation-syntax-checking.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 Requires(pre):  %{install_info_prereq}
@@ -96,9 +94,8 @@ mechanism, and more.
 This package contains the Zsh manual in html format.
 
 %prep
-%setup -q -n %{name}-4.3.12-test-3
+%setup -q -n %{name}-%{version}
 %patch1
-%patch2 -p1
 
 # Remove executable bit
 chmod 0644 Etc/changelog2html.pl