From 3a1035d61299bdca176591860c53e212036f2f7ef36f9fd532776093abfeeacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 5 Mar 2017 19:32:31 +0000
Subject: [PATCH] Accepting request 477019 from home:susnux:branches:shells

Update that fixes at least some annoying completion bugs and the printf bug (patched on openSUSE) is also resolved.

OBS-URL: https://build.opensuse.org/request/show/477019
OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=182
---
 fix-printf.patch     | 13 -------------
 zsh-5.3.1.tar.xz     |  3 +++
 zsh-5.3.1.tar.xz.asc | 11 +++++++++++
 zsh-5.3.tar.xz       |  3 ---
 zsh-5.3.tar.xz.asc   | 11 -----------
 zsh.changes          | 10 ++++++++++
 zsh.spec             |  8 ++------
 7 files changed, 26 insertions(+), 33 deletions(-)
 delete mode 100644 fix-printf.patch
 create mode 100644 zsh-5.3.1.tar.xz
 create mode 100644 zsh-5.3.1.tar.xz.asc
 delete mode 100644 zsh-5.3.tar.xz
 delete mode 100644 zsh-5.3.tar.xz.asc

diff --git a/fix-printf.patch b/fix-printf.patch
deleted file mode 100644
index edf9a9f..0000000
--- a/fix-printf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: zsh-5.3/Src/builtin.c
-===================================================================
---- zsh-5.3.orig/Src/builtin.c
-+++ zsh-5.3/Src/builtin.c
-@@ -100,7 +100,7 @@ static struct builtin builtins[] =
- 
-     BUILTIN("popd", BINF_SKIPINVALID | BINF_SKIPDASH | BINF_DASHDASHVALID, bin_cd, 0, 1, BIN_POPD, "q", NULL),
-     BUILTIN("print", BINF_PRINTOPTS, bin_print, 0, -1, BIN_PRINT, "abcC:Df:ilmnNoOpPrRsSu:v:x:X:z-", NULL),
--    BUILTIN("printf", 0, bin_print, 1, -1, BIN_PRINTF, "v:", NULL),
-+    BUILTIN("printf", BINF_SKIPINVALID | BINF_SKIPDASH, bin_print, 1, -1, BIN_PRINTF, "v:", NULL),
-     BUILTIN("pushd", BINF_SKIPINVALID | BINF_SKIPDASH | BINF_DASHDASHVALID, bin_cd, 0, 2, BIN_PUSHD, "qsPL", NULL),
-     BUILTIN("pushln", 0, bin_print, 0, -1, BIN_PRINT, NULL, "-nz"),
-     BUILTIN("pwd", 0, bin_pwd, 0, 0, 0, "rLP", NULL),
diff --git a/zsh-5.3.1.tar.xz b/zsh-5.3.1.tar.xz
new file mode 100644
index 0000000..a8f6d79
--- /dev/null
+++ b/zsh-5.3.1.tar.xz
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..146caf7
--- /dev/null
+++ b/zsh-5.3.1.tar.xz.asc
@@ -0,0 +1,11 @@
+-----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.3.tar.xz b/zsh-5.3.tar.xz
deleted file mode 100644
index b274035..0000000
--- a/zsh-5.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a
-size 2928684
diff --git a/zsh-5.3.tar.xz.asc b/zsh-5.3.tar.xz.asc
deleted file mode 100644
index 7c22717..0000000
--- a/zsh-5.3.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABCAAGBQJYTYfAAAoJEKcdmp1L2yezCKUH/RPI0C/WcqYcBU8NBZtESudL
-WkHhoxndQGh3DwhNn6ueCEo3h7VFm+ET28fs7HDHcfcUynm6jiii/ZE4mGr628EI
-oAEIQQs19ymmU1jCTFdZwMv7m+QJF/hjC0iIQUodXt3UuQ8x+hXdpGWP7Y9FyFt8
-rMg4Yqh6Y+81IaFfVIItgpZtp1c8HcjUBC176sQV+Q5dmXSXCUg8zTV/jCqvnhes
-mfMXDVlRUOWlz7YbVjg8G94e8RuK/EaBwVGmnmh7hXt0AoYlU5gLYxBg3QB+kd/J
-sVAVs+W77AURRFXlxbsxAuWSGpwNtPl+nPGxJXh2whr8h8uhW12H6OdutGEF8Qw=
-=DUlK
------END PGP SIGNATURE-----
diff --git a/zsh.changes b/zsh.changes
index fa4728a..434b4f1 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Mar  5 14:40:13 UTC 2017 - rpm@fthiessen.de
+
+- Update to 5.3.1
+  * Fix typo in chflags completion
+  * Fixed invalid git commands completion
+  * VCS info system: vcs_info git: Avoid a fork.
+  * Fix handling of "printf -" and "printf --"
+- Removed upstream merged fix-printf.patch
+
 -------------------------------------------------------------------
 Tue Jan 10 16:27:19 UTC 2017 - jmatejek@suse.com
 
diff --git a/zsh.spec b/zsh.spec
index e65c60f..7202142 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -17,7 +17,7 @@
 
 
 Name:           zsh
-Version:        5.3
+Version:        5.3.1
 Release:        0%{?dist}
 Summary:        Shell with comprehensive completion
 License:        MIT
@@ -40,16 +40,13 @@ 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-printf.patch
-Patch4:         fix-patchutils-completion.patch
+Patch3:         fix-patchutils-completion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  groff
 %if 0%{?suse_version}
 Requires(pre):  %{install_info_prereq}
-%if 0%{?suse_version} >= 1110
 BuildRequires:  fdupes
 BuildRequires:  yodl
-%endif
 %if 0%{?suse_version} >= 1210
 BuildRequires:  makeinfo
 BuildRequires:  texi2html
@@ -104,7 +101,6 @@ This package contains the Zsh manual in html format.
 %endif
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 # Remove executable bit
 chmod 0644 Etc/changelog2html.pl