rebase to latest upstream release

Per http://lists.gnu.org/archive/html/automake/2018-03/msg00019.html

Version: 1.16.1-1
This commit is contained in:
Pavel Raiskup 2018-03-12 08:49:35 +01:00
parent 34371ff3fd
commit 777005b8a5
4 changed files with 8 additions and 52 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/automake-1.15.1.tar.xz
/automake-1.16.1.tar.xz

View File

@ -1,49 +0,0 @@
From 3b86722e504c686d3e825ca8870708cce7580190 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
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

View File

@ -1,4 +1,4 @@
%global api_version 1.15
%global api_version 1.16
# run "make check" by default
%bcond_without check
@ -11,7 +11,7 @@
Summary: A GNU tool for automatically creating Makefiles
Name: automake
Version: %{api_version}.1
Release: 5%{?dist}
Release: 1%{?dist}
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
License: GPLv2+ and GFDL and Public Domain and MIT
@ -26,7 +26,6 @@ Source3: http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
%if %{with check} && !%{without automake_enables_optional_test}
Patch0: automake-1.15-disable-vala-tests.patch
Patch1: automake-1.15-dejagnu-testcase.patch
%endif
URL: http://www.gnu.org/software/automake/
@ -130,6 +129,10 @@ fi
%{_mandir}/man1/*
%changelog
* Mon Mar 12 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-1
- latest upstream release, per
http://lists.gnu.org/archive/html/automake/2018-03/msg00019.html
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.15.1-5
- Escape macros in %%changelog

View File

@ -1 +1,2 @@
SHA512 (automake-1.15.1.tar.xz) = 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
SHA512 (automake-1.16.1.tar.xz) = 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3