Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/zsh.git#9f49b18e48f82ad39c4b0dd82c32ea9963d0ab6a
This commit is contained in:
DistroBaker 2021-03-29 18:35:26 +00:00
parent 0d2707fc10
commit 9e5efcd5d4
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,27 @@
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

View File

@ -1,7 +1,7 @@
Summary: Powerful interactive shell
Name: zsh
Version: 5.8
Release: 4%{?dist}
Release: 5%{?dist}
License: MIT
URL: http://zsh.sourceforge.net/
Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@ -12,6 +12,9 @@ Source4: zshrc.rhs
Source5: zshenv.rhs
Source6: dotzshrc
# complete file arguments after rpmbuild -r/-b/-t
Patch1: 0001-zsh-5.8-comp-rpm.patch
BuildRequires: autoconf
BuildRequires: coreutils
BuildRequires: gawk
@ -155,6 +158,9 @@ fi
%doc Doc/*.html
%changelog
* Thu Mar 25 2021 Kamil Dudka <kdudka@redhat.com> - 5.8-5
- complete file arguments after rpmbuild -r/-b/-t
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild