From 18fc23fb63d70c2e3be79f4358dc84b70803842c Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Sun, 15 May 2022 09:15:57 +0200
Subject: [PATCH] update to latest upstream release: 5.9

---
 .gitignore                  |  5 +----
 0001-zsh-5.8-comp-rpm.patch | 27 ---------------------------
 sources                     |  3 ++-
 zsh-5.8.1.tar.xz.asc        | 11 -----------
 zsh.spec                    | 10 +++++-----
 5 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 0001-zsh-5.8-comp-rpm.patch
 delete mode 100644 zsh-5.8.1.tar.xz.asc

diff --git a/.gitignore b/.gitignore
index 0a91fd3..55ad85c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/zsh-5.*.*.tar.bz2
 /zsh-5.*.tar.xz
-/zsh-5.4.2.tar.gz
-/*.src.rpm
-results_*/
+/zsh-5.*.tar.xz.asc
diff --git a/0001-zsh-5.8-comp-rpm.patch b/0001-zsh-5.8-comp-rpm.patch
deleted file mode 100644
index 3a91f0b..0000000
--- a/0001-zsh-5.8-comp-rpm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d8ec07a4779f4675139c650979eb87dd6d7a5d92 Mon Sep 17 00:00:00 2001
-From: Daniel Shahaf <d.s@daniel.shahaf.name>
-Date: Tue, 18 Aug 2020 13:30:04 +0000
-Subject: [PATCH] 47323: _rpmbuild: Complete file arguments after -r/-b/-t.
-
-Upstream-commit: e14e899ab96c4171544a244ddc39991512ec41c8
-Signed-off-by: Kamil Dudka <kdudka@redhat.com>
----
- Completion/Redhat/Command/_rpm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Completion/Redhat/Command/_rpm b/Completion/Redhat/Command/_rpm
-index e346924..db7c114 100644
---- a/Completion/Redhat/Command/_rpm
-+++ b/Completion/Redhat/Command/_rpm
-@@ -282,7 +282,7 @@ _rpm () {
-     build_r) tmp=( '*:source package:_files -g "*.(#i)src.rpm(-.)"' ) ;|
-     build_t) tmp=( '*:tar file:_files -g "*.(#i)tar(.*|)(-.)"' ) ;|
-     build_?)
--      _arguments -s -C $buildopts $commonopts $pathopts \
-+      _arguments -s -C $buildopts $commonopts $pathopts "${tmp[@]}" \
-       ;;
-     checksig)
-       _arguments -s -C \!-K \
--- 
-2.26.3
-
diff --git a/sources b/sources
index 3a2f734..747480c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (zsh-5.8.1.tar.xz) = f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d
+SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
+SHA512 (zsh-5.9.tar.xz.asc) = b6a72f8dfd2ed9c25e4afa5b3d13b23c1bf0bceacfce3ad0fadf24a9df91382914f7322ef4ed8bfb4b68818fb18fe3973d22154a6cc638b46f02e30bafd93fcb
diff --git a/zsh-5.8.1.tar.xz.asc b/zsh-5.8.1.tar.xz.asc
deleted file mode 100644
index ef4fd0c..0000000
--- a/zsh-5.8.1.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAmIHy2YACgkQrPgUbK6M
-u8RlaAgAxhHK9+kn+yzsS2/eED+VjLjCNcyPqdVdBl+bS4xeN5v2Ga0D36TfYJ4J
-3n6INHTeR8gpocFyY5RRxZcDeGPtsPV4JQlmAJMa43piLP1LZvbgKAVeooWWeIKk
-JMzXXAKWhZQ2+IG+OXlLNaHSLy6YBJ//Kj3lUkI7NHLSjOhce9ER1QwrHyeHmsKV
-RmjeKlu4gwCPtXGgRmRihnIYJNI38db9Hc2vjunasGaM30l+8ymeVBjH395EDXL7
-bfn8Vb0rN6TQY5q+4kVkG9J6m7kfgozcbCuiygsDG7zPdbI6Iwgzx+WmMoKWFfX6
-y5MZIeVwkWUscDcghU8uUhQ2mu3pmw==
-=2cR1
------END PGP SIGNATURE-----
diff --git a/zsh.spec b/zsh.spec
index 2eccf07..d0594d8 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,6 +1,6 @@
 Summary: Powerful interactive shell
 Name: zsh
-Version: 5.8.1
+Version: 5.9
 Release: 1%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
@@ -13,9 +13,6 @@ Source5: zshenv.rhs
 Source6: dotzshrc
 Source7: dotzprofile
 
-# complete file arguments after rpmbuild -r/-b/-t
-Patch1:  0001-zsh-5.8-comp-rpm.patch
-
 BuildRequires: autoconf
 BuildRequires: coreutils
 BuildRequires: gawk
@@ -123,7 +120,7 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.zprofile
 # This is just here to shut up rpmlint, and is very annoying.
 # Note that we can't chmod everything as then rpmlint will complain about
 # those without a she-bang line.
-for i in checkmail harden run-help zcalc zkbd; do
+for i in checkmail harden run-help test-repo-git-rebase-{apply,merge} zcalc zkbd; do
     sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' \
     $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i
     chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{version}/functions/$i
@@ -163,6 +160,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Sun May 15 2022 Kamil Dudka <kdudka@redhat.com> - 5.9-1
+- update to latest upstream release
+
 * Sun Feb 13 2022 Kamil Dudka <kdudka@redhat.com> - 5.8.1-1
 - update to latest upstream release (fixes CVE-2021-45444)