.dejagnu.metadata

@@ -1 +1 @@
-ba903ad48b122a09c5ed2762ac6854ec7f6d3338 SOURCES/dejagnu-1.6.1.tar.gz
+390b586609bb23c807218eda493f428c4a913bc1 SOURCES/dejagnu-1.6.3.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dejagnu-1.6.1.tar.gz
+SOURCES/dejagnu-1.6.3.tar.gz

SOURCES/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

SPECS/dejagnu.spec

@@ -1,15 +1,19 @@
 Summary: A front end for testing other programs
 Name: dejagnu
-Version: 1.6.1
+Version: 1.6.3
 Release: 2%{?dist}
 Epoch: 1
 License: GPLv3+
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-%{version}.tar.gz
-Group: Development/Tools
 URL: http://www.gnu.org/software/dejagnu/
 Requires: expect
 BuildArch: noarch
-BuildRequires: expect screen texinfo
+BuildRequires:  gcc
+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.
@@ -21,21 +25,22 @@ 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`
-screen -D -m sh -c '(make check RUNTESTFLAGS="RUNTEST=`pwd`/runtest"; echo $?) >> '$TMP
+export SCREENDIR=`mktemp -d`
+# 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
+rm -rf $SCREENDIR
 echo ============END TESTING===========
 exit $RESULT
 
@@ -46,28 +51,59 @@ chmod a-x $RPM_BUILD_ROOT/%{_datadir}/dejagnu/runtest.exp
 make DESTDIR=$RPM_BUILD_ROOT install-man
 install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info
 
-%post
-/sbin/install-info %{_infodir}/%{name}.info.gz --dir-file=%{_infodir}/dir &> /dev/null
-:
-
-%preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir &> /dev/null
-fi
-:
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %doc COPYING NEWS README AUTHORS ChangeLog doc/dejagnu.texi
 %{_bindir}/runtest
+%{_bindir}/dejagnu
 %{_datadir}/dejagnu
 %{_includedir}/dejagnu.h
 %{_mandir}/*/*
 %{_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
+
+* Wed Aug 11 2021 Marek Polacek <polacek@redhat.com> - 1:1.6.1-13
+- re-apply dejagnu-1.6-runtest.patch (#1990804)
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.6.1-12
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu May 20 2021 Marek Polacek <polacek@redhat.com> - 1:1.6.1-11
+- Remove screen build dependency (#1962907)
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.6.1-10
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 24 2018 Matej Mužila <mmuzila@redhat.com> - 1:1.6.1-4
+- Fix tests
+- Add BuildRequires: gcc-c++
+- Resolves: #1603770
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild