From d89b990ff4b3e4bb9cdfdaee6961ff853d3dac91 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Wed, 19 Jan 2022 16:20:59 -0500
Subject: [PATCH] Re-re-apply dejagnu-1.6-runtest.patch

---
 .dejagnu.metadata         |  1 +
 dejagnu-1.6-runtest.patch | 12 ++++++++++++
 dejagnu.spec              |  8 +++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 .dejagnu.metadata
 create mode 100644 dejagnu-1.6-runtest.patch

diff --git a/.dejagnu.metadata b/.dejagnu.metadata
new file mode 100644
index 0000000..673dd73
--- /dev/null
+++ b/.dejagnu.metadata
@@ -0,0 +1 @@
+390b586609bb23c807218eda493f428c4a913bc1 dejagnu-1.6.3.tar.gz
diff --git a/dejagnu-1.6-runtest.patch b/dejagnu-1.6-runtest.patch
new file mode 100644
index 0000000..aeefc38
--- /dev/null
+++ b/dejagnu-1.6-runtest.patch
@@ -0,0 +1,12 @@
+--- dejagnu-1.6.1/runtest.exp.orig	2017-10-16 07:43:20.000000000 -0400
++++ dejagnu-1.6.1/runtest.exp	2021-08-11 10:54:51.172965763 -0400
+@@ -1601,8 +1601,7 @@ proc runtest { test_file_name } {
+     global testdir
+ 
+     clone_output "Running $test_file_name ..."
+-    set prms_id	0
+-    set bug_id	0
++    reset_vars
+     set test_result ""
+ 
+     # set testdir so testsuite file -test has a starting point
diff --git a/dejagnu.spec b/dejagnu.spec
index 4519e62..6eb1895 100644
--- a/dejagnu.spec
+++ b/dejagnu.spec
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
 Version: 1.6.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv3+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -13,6 +13,8 @@ BuildRequires:  gcc-c++
 BuildRequires: expect texinfo
 BuildRequires: make
 
+Patch0: dejagnu-1.6-runtest.patch
+
 %description
 DejaGnu is an Expect/Tcl based framework for testing other programs.
 DejaGnu has several purposes: to make it easy to write tests for any
@@ -23,6 +25,7 @@ into software development).
 
 %prep
 %setup -q
+%patch0 -p1 -b .runtest~
 
 %build
 %configure -v
@@ -58,6 +61,9 @@ install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
 %{_infodir}/dejagnu*
 
 %changelog
+* Wed Jan 19 2022 Marek Polacek <polacek@redhat.com> - 1:1.6.3-2
+- re-re-apply dejagnu-1.6-runtest.patch (#2042478)
+
 * Tue Jan 11 2022 Honza Horak <hhorak@redhat.com> - 1:1.6.3-1
 - Rebase to 1.6.3
   Resolves: #1954158