From 0d2707fc107052390c3bc262943bcf3eb7914b83 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 3 Feb 2021 22:54:47 +0000
Subject: [PATCH] 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    |  1 +
 plans/shell.fmf | 14 ++++++++++++++
 tests/tests.yml | 17 -----------------
 zsh.spec        |  6 +++++-
 4 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/shell.fmf
 delete mode 100644 tests/tests.yml

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/plans/shell.fmf b/plans/shell.fmf
new file mode 100644
index 0000000..bcc3572
--- /dev/null
+++ b/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
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 3d505a4..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -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
diff --git a/zsh.spec b/zsh.spec
index 1c04649..3dc6f89 100644
--- a/zsh.spec
+++ b/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