diff --git a/automake-1.15-dejagnu-testcase.patch b/automake-1.15-dejagnu-testcase.patch new file mode 100644 index 0000000..3af46ad --- /dev/null +++ b/automake-1.15-dejagnu-testcase.patch @@ -0,0 +1,49 @@ +From 3b86722e504c686d3e825ca8870708cce7580190 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Mon, 27 Jun 2016 23:10:12 +0200 +Subject: [PATCH] tests: fix bug in dejagnu testcase + +This resolves testsuite error: +ERROR: tcl error sourcing ./spanner.test/spanner.exp. +ERROR: couldn't execute "./spanner": no such file or directory + while executing +"spawn $SPANNER" + (file "./spanner.test/spanner.exp" line 2) + invoked from within +"source ./spanner.test/spanner.exp" + ("uplevel" body line 1) + invoked from within +"uplevel #0 source ./spanner.test/spanner.exp" + invoked from within +"catch "uplevel #0 source $test_file_name"" + +.. which was there probably for a very long time, but now with +dejagnu 1.6 the runtest binary started to validly exit with +non-zero status. + +* t/check12.sh (Makefile.am): Also distribute files from +$(DEJATOOL) because otherwise 'runtest' binary fails later during +'make distcheck' because of incomplete list of distributed files. + +Proposed upstream: +http://thread.gmane.org/gmane.comp.sysutils.automake.patches/9941 + +--- + t/check12.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/t/check12.sh b/t/check12.sh +index 0f3928a..306c720 100644 +--- a/t/check12.sh ++++ b/t/check12.sh +@@ -61,6 +61,7 @@ DEJATOOL = hammer spanner + AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner + EXTRA_DIST += hammer.test/hammer.exp + EXTRA_DIST += spanner.test/spanner.exp ++EXTRA_DIST += $(DEJATOOL) + END + + cat > hammer << 'END' +-- +2.7.4 + diff --git a/automake.spec b/automake.spec index 57d9efc..d50dcb6 100644 --- a/automake.spec +++ b/automake.spec @@ -6,7 +6,7 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake Version: %{api_version} -Release: 6%{?dist} +Release: 7%{?dist} # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT License: GPLv2+ and GFDL and Public Domain and MIT @@ -19,6 +19,7 @@ Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess # Keep those patches in 'git format-patch' format (with docs). Patch0: automake-1.15-disable-vala-tests.patch Patch1: automake-1.15-perl-escape-curly-bracket.patch +Patch2: automake-1.15-dejagnu-testcase.patch URL: http://www.gnu.org/software/automake/ Requires: autoconf >= 2.65 @@ -117,6 +118,9 @@ fi %{_mandir}/man1/* %changelog +* Mon Jun 27 2016 Pavel Raiskup - 1.15-7 +- FTBFS fix, rhbz#1349381 + * Wed Feb 03 2016 Fedora Release Engineering - 1.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild