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#8d4d20225079cb93ca7686bec86e8cbb0793c8c1

.fmf/version

@@ -0,0 +1 @@
+1

plans/shell.fmf

@@ -0,0 +1,14 @@
+summary:
+    Run relevant tests from the shell tests repository
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/shell
+    filter: component:zsh
+prepare:
+    how: install
+    package: zsh
+execute:
+    how: tmt
+environment:
+    PACKAGES: zsh
+    SH_BIN: zsh

tests/tests.yml

@@ -1,17 +0,0 @@
----
-
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/shell.git"
-      dest: "shell"
-      fmf_filter: "tier: 1, 2"
-    environment:
-      PACKAGES: zsh
-      SH_BIN: zsh
-    required_packages:
-    - expect            # login requires expect
-    - which             # smoke requires which

zsh.spec

@@ -1,7 +1,7 @@
 Summary: Powerful interactive shell
 Name: zsh
 Version: 5.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 URL: http://zsh.sourceforge.net/
 Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
@@ -19,6 +19,7 @@ BuildRequires: gcc
 BuildRequires: gdbm-devel
 BuildRequires: glibc-langpack-ja
 BuildRequires: libcap-devel
+BuildRequires: make
 BuildRequires: ncurses-devel
 BuildRequires: pcre-devel
 BuildRequires: sed
@@ -154,6 +155,9 @@ fi
 %doc Doc/*.html
 
 %changelog
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild