From 8e2e7164870bee8489522cb17b840beb93c6fcab Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Tue, 11 Jan 2022 19:03:05 +0100
Subject: [PATCH] Rebase to 1.6.3

Resolves: #1954158
---
 .gitignore                |  1 +
 dejagnu-1.6-runtest.patch | 12 ------------
 dejagnu.spec              | 20 ++++++++++----------
 sources                   |  2 +-
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 dejagnu-1.6-runtest.patch

diff --git a/.gitignore b/.gitignore
index 441c65b..1a2602c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ dejagnu.texi
 /dejagnu-1.5.3.tar.gz
 /dejagnu-1.6.tar.gz
 /dejagnu-1.6.1.tar.gz
+/dejagnu-1.6.3.tar.gz
diff --git a/dejagnu-1.6-runtest.patch b/dejagnu-1.6-runtest.patch
deleted file mode 100644
index 49a3075..0000000
--- a/dejagnu-1.6-runtest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
-@@ -1444,8 +1444,7 @@ proc runtest { test_file_name } {
-     global tool
- 
-     clone_output "Running $test_file_name ..."
--    set prms_id	0
--    set bug_id	0
-+    reset_vars
-     set test_result ""
- 
-     if {[file exists $test_file_name]} {
diff --git a/dejagnu.spec b/dejagnu.spec
index 351f73e..4519e62 100644
--- a/dejagnu.spec
+++ b/dejagnu.spec
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs
 Name: dejagnu
-Version: 1.6.1
-Release: 13%{?dist}
+Version: 1.6.3
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv3+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
@@ -13,8 +13,6 @@ 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
@@ -25,20 +23,17 @@ into software development).
 
 %prep
 %setup -q
-%patch0 -p1 -b .runtest~
 
 %build
 %configure -v
 
 %check
 echo ============TESTING===============
-# Dejagnu test suite also has to test reporting to user.  It needs a
-# terminal for that.  That doesn't compute in mock.  Work around it by
-# running the test under screen and communicating back to test runner
-# via temporary file.  If you have better idea, we accept patches.
 TMP=`mktemp`
 export SCREENDIR=`mktemp -d`
-(make check RUNTESTFLAGS="RUNTEST=`pwd`/runtest"; echo $?) >> $TMP
+# Skip selected tests.  Failed testcases reported upstream:
+# https://lists.gnu.org/archive/html/dejagnu/2021-09/msg00001.html
+(make check RUNTESTFLAGS="--ignore pr48155.exp stats.exp"; echo $?) >> $TMP
 RESULT=`tail -n 1 $TMP`
 cat $TMP
 rm -f $TMP
@@ -56,12 +51,17 @@ install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
 %files
 %doc COPYING NEWS README AUTHORS ChangeLog doc/dejagnu.texi
 %{_bindir}/runtest
+%{_bindir}/dejagnu
 %{_datadir}/dejagnu
 %{_includedir}/dejagnu.h
 %{_mandir}/*/*
 %{_infodir}/dejagnu*
 
 %changelog
+* Tue Jan 11 2022 Honza Horak <hhorak@redhat.com> - 1:1.6.3-1
+- Rebase to 1.6.3
+  Resolves: #1954158
+
 * Wed Aug 11 2021 Marek Polacek <polacek@redhat.com> - 1:1.6.1-13
 - re-apply dejagnu-1.6-runtest.patch (#1990804)
 
diff --git a/sources b/sources
index f7b1a1b..f7550bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dejagnu-1.6.1.tar.gz) = 887aa7c8b8698fe193f393b75479aad2c0724d6baa52e6f7172c48172f6546956c5f932afb574ba38b7c79e630981eeaf1d6d3c9edb3862ab5f39c5c09dce682
+SHA512 (dejagnu-1.6.3.tar.gz) = 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4