From c391f10934686e2f66bee018fdbc2c0e69114794b49eeed6ec4166ddb19661f8 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 6 Jan 2021 16:31:27 +0000
Subject: [PATCH 1/2] - update to 1.16.3:   - In the testsuite summary, the
 "for $(PACKAGE_STRING)" suffix     can be overridden with the
 AM_TESTSUITE_SUMMARY_HEADER variable.   - Python 3.10 version number no
 longer considered to be 3.1.   - Broken links in manual fixed or removed, and
 new script     contrib/checklinkx (a small modification of W3C checklink)
 added,     with accompany target checklinkx to recheck urls.   - install-exec
 target depends on $(BUILT_SOURCES).   - valac argument matching more precise,
 to avoid garbage in DIST_COMMON.   - Support for Vala in VPATH builds fixed
 so that both freshly-generated and     distributed C files work, and
 operation is more reliable with or without     an installed valac.   -
 Dejagnu doesn't break on directories containing spaces.   - new variable
 AM_DISTCHECK_DVI_TARGET, to allow overriding the     "make dvi" that is done
 as part of distcheck.   - install-sh tweaks:     . new option -p to preserve
 mtime, i.e., invoke cp -p.     . new option -S SUFFIX to attempt backup files
 using SUFFIX.     . no longer unconditionally uses -f when rm is overridden
 by RMPROG.     . does not chown existing directories.   - Removed function
 up_to_date_p in lib/Automake/FileUtils.pm.     We believe this function is
 completely unused.   - Support for in-tree Vala libraries improved. - rename
 automake-SuSE.patch to automake-suse-vendor.patch and refresh - remove
 automake-testsuite-vala-gcc10.patch (upstream)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=83
---
 ...ameter-parsing-in-test-driver-script.patch |  13 +-
 automake-1.16.2.tar.xz                        |   3 -
 automake-1.16.2.tar.xz.sig                    |  16 -
 automake-1.16.3.tar.xz                        |   3 +
 automake-1.16.3.tar.xz.sig                    |  16 +
 automake-require_file.patch                   |   8 +-
 ...e-SuSE.patch => automake-suse-vendor.patch | 355 ++++++++++++------
 automake-testsuite-vala-gcc10.patch           |  23 --
 automake.changes                              |  29 ++
 automake.keyring                              | 226 +++++++++--
 automake.spec                                 |  12 +-
 11 files changed, 482 insertions(+), 222 deletions(-)
 delete mode 100644 automake-1.16.2.tar.xz
 delete mode 100644 automake-1.16.2.tar.xz.sig
 create mode 100644 automake-1.16.3.tar.xz
 create mode 100644 automake-1.16.3.tar.xz.sig
 rename automake-SuSE.patch => automake-suse-vendor.patch (59%)
 delete mode 100644 automake-testsuite-vala-gcc10.patch

diff --git a/0001-correct-parameter-parsing-in-test-driver-script.patch b/0001-correct-parameter-parsing-in-test-driver-script.patch
index a939c69..cf49b6e 100644
--- a/0001-correct-parameter-parsing-in-test-driver-script.patch
+++ b/0001-correct-parameter-parsing-in-test-driver-script.patch
@@ -10,11 +10,11 @@ The patch adds support for both.
  lib/test-driver | 27 ++++++++++++++++-----------
  1 file changed, 16 insertions(+), 11 deletions(-)
 
-diff --git a/lib/test-driver b/lib/test-driver
-index 8e575b0..69b47f8 100755
---- a/lib/test-driver
-+++ b/lib/test-driver
-@@ -56,21 +56,26 @@ trs_file=  # Where to save the metadata of the test run.
+Index: automake-1.16.3/lib/test-driver
+===================================================================
+--- automake-1.16.3.orig/lib/test-driver
++++ automake-1.16.3/lib/test-driver
+@@ -58,21 +58,26 @@ trs_file=  # Where to save the metadata
  expect_failure=no
  color_tests=no
  enable_hard_errors=yes
@@ -52,6 +52,3 @@ index 8e575b0..69b47f8 100755
  done
  
  missing_opts=
--- 
-2.6.6
-
diff --git a/automake-1.16.2.tar.xz b/automake-1.16.2.tar.xz
deleted file mode 100644
index 1576e73..0000000
--- a/automake-1.16.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccc459de3d710e066ab9e12d2f119bd164a08c9341ca24ba22c9adaa179eedd0
-size 1545912
diff --git a/automake-1.16.2.tar.xz.sig b/automake-1.16.2.tar.xz.sig
deleted file mode 100644
index af0d8b9..0000000
--- a/automake-1.16.2.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAl52mAoACgkQf9n8ywAL
-7u7kdw//S3/YlrDVGYgBBj8gyDisiuAQPthoz9fXoGyjutqxxnU+o5lV6lrzI+Ti
-wEfM4ZBaN/vXkc/YMpxnNMw4fRYcH4/mz2YTaJZzOHZEOdF4V6Vb3PdxH7O3AUS2
-krwfWicsZ+bAOwG1vawWwBawIH8w2mmA/NP7WP4r4NcgCuaDg7iQv/2aknvrVXN2
-u1Z5DQZ8iXo/S7Q8NH3GJIswnD6Jn0VQf3z9yFxXVOZ5Y/NMjDKxVtBaurMTpMcj
-50JDmy6iiK9rY1ngLszvBxvkRR3g5q2K/VKuJmWteLCCdFLBSA05h/5vmPX+TUOt
-15G9bm2n0IAsZn9YudvEBIydnZmJf5zRaZsmpNDdCQgsB/SIdV9y6F536jA1Mdxs
-VJ1iB8sQlCkdl/GWAz3ZkYmIuIODEYVWbBaQJ65BUL5Ofmxak2ymV82g0cD2GQo9
-VlvUhLZWAGWYtZjDq+4geHpSdrfkJheYJdUbQ6pMNjghXsNluXs/4PxydPobK8WG
-F+MEpKDMuUvIVdW++y22pz/MGqVWpTjMdUsBEr4FT/4jSMw+H7zDgC3xs/XPUx5L
-Bu6UFWBqY/RyR4JpqbecCe9zlwb+zul67nWowOvD0S2IqoI6B1L1mnxg/BYCJf59
-2gGY3db5CO41K/qogsuVQm/JBH8E7ZLBAmGqBpbe2a6UZkOr5ds=
-=OgSk
------END PGP SIGNATURE-----
diff --git a/automake-1.16.3.tar.xz b/automake-1.16.3.tar.xz
new file mode 100644
index 0000000..597c05b
--- /dev/null
+++ b/automake-1.16.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a
+size 1590708
diff --git a/automake-1.16.3.tar.xz.sig b/automake-1.16.3.tar.xz.sig
new file mode 100644
index 0000000..f858deb
--- /dev/null
+++ b/automake-1.16.3.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAl+18AEACgkQf9n8ywAL
+7u5g3w//X3DAHyoXHHrUfJ0H2M37mr/aGdAOHXcLvLEX3e3Ke28Stc+gwJXGlLJe
+VcM3sdv7/t66hx8BB4QaQjP76zmsBDCgBzdyWOPUX5NMCun+9GkjgPjSxd8udncJ
+qShW6S9FSTczry1Jo4+moysL8Lv+UzUOwdoJlLJCjhFl3ek4hLWXrKAqvS5s+InH
+ExFPQzjcSG+SBHg0T57fVNpmk7Aw/2RB9jt2PHjTgv0KjMeFe9UDTBYFF0UY8kNT
+4Fol5YFPLKWp0bh8BC2fSt3U6ppvv9sbXb+ePkPdEixqR4g5lv2W9kfLibtwU/Tn
+EY5v624NYjIV1udHIFNsqup07evnd29zsSEd+x8+yZIS2FNe26Y5pznd8KuM5EoO
+Dt4XUiHq11lQUcdx9Y1N+r7aXLncv+v8zb0G1by4/1sXzNLH3WXTCCAc2l1iSYus
+MtrlJ+hjR7hNS8NR6aUCqScgOCZMhQ7AmbF8sqoTqLtr26pvI39EAXu2LaeaCqTj
+BRuchHuhOnpNMCf4KQAkYOwTEen0JqEXDNwwswQpGOXYx050U1InubVGsseVYvnO
+k8vL8yB0cx+07doObAIeySJ511GrOgVJzP89r1K3nU2Y9P2Xd3EI9H54m8Pylv48
+iuDefSXOSnktcAdx6Qn5IBuqYP3EySTj5J+Tbu8BmsxuxuFa8dY=
+=BGqq
+-----END PGP SIGNATURE-----
diff --git a/automake-require_file.patch b/automake-require_file.patch
index cf42c68..b6177a4 100644
--- a/automake-require_file.patch
+++ b/automake-require_file.patch
@@ -2,11 +2,11 @@
  bin/automake.in |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-Index: automake-1.16.1/bin/automake.in
+Index: automake-1.16.3/bin/automake.in
 ===================================================================
---- automake-1.16.1.orig/bin/automake.in	2018-03-08 21:27:05.000000000 +0100
-+++ automake-1.16.1/bin/automake.in	2018-03-21 12:35:37.288053253 +0100
-@@ -7540,12 +7540,14 @@ sub required_file_check_or_copy
+--- automake-1.16.3.orig/bin/automake.in
++++ automake-1.16.3/bin/automake.in
+@@ -7569,12 +7569,14 @@ sub required_file_check_or_copy
    my $fullfile = "$dir/$file";
    my $found_it = 0;
    my $dangling_sym = 0;
diff --git a/automake-SuSE.patch b/automake-suse-vendor.patch
similarity index 59%
rename from automake-SuSE.patch
rename to automake-suse-vendor.patch
index 63c9ef6..2c0d8e7 100644
--- a/automake-SuSE.patch
+++ b/automake-suse-vendor.patch
@@ -1,13 +1,6 @@
----
- lib/config.guess |  172 +++++++++++++++++++++++++++++--------------------------
- lib/config.sub   |   10 ++-
- 2 files changed, 99 insertions(+), 83 deletions(-)
-
-Index: lib/config.guess
-===================================================================
---- lib/config.guess.orig	2018-03-21 12:19:27.861785205 +0100
-+++ lib/config.guess	2018-03-21 12:34:07.619472760 +0100
-@@ -160,6 +160,16 @@ Linux|GNU|GNU/*)
+--- automake-1.16.3/lib/config.guess
++++ automake-1.16.3/lib/config.guess
+@@ -162,6 +162,17 @@
  	;;
  esac
  
@@ -20,79 +13,67 @@ Index: lib/config.guess
 +     ;;
 +esac
 +test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
++test -f /etc/os-release && grep -q suse /etc/os-release && VENDOR=suse
 +
  # Note: order is significant - the case branches are not exclusive.
  
  case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
-@@ -188,9 +198,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
- 	    earmv*)
- 		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- 		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
--		machine="${arch}${endian}"-unknown
-+		machine="${arch}${endian}"-${VENDOR}-unknown
- 		;;
--	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
-+	    *) machine="$UNAME_MACHINE_ARCH"-${VENDOR}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
- 	# to ELF recently (or will in the future) and ABI.
-@@ -245,42 +245,42 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
-	exit ;;
+@@ -244,42 +255,42 @@
+ 	exit ;;
      *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ 	UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//')
 -	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE_ARCH"-${VENDOR}-bitrig"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//')
 -	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE_ARCH"-${VENDOR}-openbsd"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:LibertyBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+ 	UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//')
 -	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE_ARCH"-${VENDOR}-libertybsd"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:MidnightBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE"-${VENDOR}-midnightbsd"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:ekkoBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE"-${VENDOR}-ekkobsd"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:SolidBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE"-${VENDOR}-solidbsd"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:OS108:*:*)
 -	echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE"-${VENDOR}-os108_"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      macppc:MirBSD:*:*)
 -	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
 +	echo powerpc-${VENDOR}-mirbsd"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:MirBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE"-${VENDOR}-mirbsd"$UNAME_RELEASE"
-	exit ;;
+ 	exit ;;
      *:Sortix:*:*)
 -	echo "$UNAME_MACHINE"-unknown-sortix
 +	echo "$UNAME_MACHINE"-${VENDOR}-sortix
-	exit ;;
+ 	exit ;;
      *:Twizzler:*:*)
 -	echo "$UNAME_MACHINE"-unknown-twizzler
 +	echo "$UNAME_MACHINE"-${VENDOR}-twizzler
-	exit ;;
+ 	exit ;;
      *:Redox:*:*)
 -	echo "$UNAME_MACHINE"-unknown-redox
 +	echo "$UNAME_MACHINE"-${VENDOR}-redox
-	exit ;;
+ 	exit ;;
      mips:OSF1:*.*)
-	echo mips-dec-osf1
-
-@@ -332,13 +342,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
+ 	echo mips-dec-osf1
+@@ -341,13 +352,13 @@
  	trap '' 0
  	exit $exitcode ;;
      Amiga*:UNIX_System_V:4.0:*)
@@ -109,7 +90,7 @@ Index: lib/config.guess
  	exit ;;
      *:OS/390:*:*)
  	echo i370-ibm-openedition
-@@ -353,7 +363,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
+@@ -362,7 +373,7 @@
  	echo arm-acorn-riscix"$UNAME_RELEASE"
  	exit ;;
      arm*:riscos:*:*|arm*:RISCOS:*:*)
@@ -118,7 +99,25 @@ Index: lib/config.guess
  	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
  	echo hppa1.1-hitachi-hiuxmpp
-@@ -461,7 +471,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM
+@@ -395,7 +406,7 @@
+ 	echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')"
+ 	exit ;;
+     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+-	echo i386-pc-auroraux"$UNAME_RELEASE"
++	echo i386-${VENDOR}-auroraux"$UNAME_RELEASE"
+ 	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	set_cc_for_build
+@@ -411,7 +422,7 @@
+ 		SUN_ARCH=x86_64
+ 	    fi
+ 	fi
+-	echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
++	echo "$SUN_ARCH"-${VENDOR}-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
+ 	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+@@ -470,7 +481,7 @@
  	echo m68k-hades-mint"$UNAME_RELEASE"
  	exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
@@ -127,10 +126,10 @@ Index: lib/config.guess
  	exit ;;
      m68k:machten:*:*)
  	echo m68k-apple-machten"$UNAME_RELEASE"
-@@ -773,9 +783,9 @@ EOF
+@@ -782,9 +793,9 @@
  	exit ;;
      i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
+ 	if test -x /usr/sbin/sysversion ; then
 -	    echo "$UNAME_MACHINE"-unknown-osf1mk
 +	    echo "$UNAME_MACHINE"-${VENDOR}-osf1mk
  	else
@@ -139,8 +138,12 @@ Index: lib/config.guess
  	fi
  	exit ;;
      parisc*:Lites*:*:*)
-@@ -835,10 +845,10 @@ EOF
- 	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+@@ -841,13 +852,13 @@
+ 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+-	echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE"-${VENDOR}-bsdi"$UNAME_RELEASE"
  	exit ;;
      sparc*:BSD/OS:*:*)
 -	echo sparc-unknown-bsdi"$UNAME_RELEASE"
@@ -150,19 +153,52 @@ Index: lib/config.guess
 -	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
 +	echo "$UNAME_MACHINE"-${VENDOR}-bsdi"$UNAME_RELEASE"
  	exit ;;
+     arm:FreeBSD:*:*)
+ 	UNAME_PROCESSOR=$(uname -p)
+@@ -855,9 +866,9 @@
+ 	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_PCS_VFP
+ 	then
+-	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
++	    echo "${UNAME_PROCESSOR}"-${VENDOR}-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi
+ 	else
+-	    echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
++	    echo "${UNAME_PROCESSOR}"-${VENDOR}-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf
+ 	fi
+ 	exit ;;
      *:FreeBSD:*:*)
- 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -848,7 +858,7 @@ EOF
+@@ -868,61 +879,61 @@
  	    i386)
  		UNAME_PROCESSOR=i586 ;;
  	esac
--	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-+	echo "$UNAME_PROCESSOR"-${VENDOR}-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+-	echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
++	echo "$UNAME_PROCESSOR"-${VENDOR}-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
  	exit ;;
      i*:CYGWIN*:*)
- 	echo "$UNAME_MACHINE"-pc-cygwin
-@@ -871,38 +881,38 @@ EOF
- 		echo i586-pc-interix"$UNAME_RELEASE"
+-	echo "$UNAME_MACHINE"-pc-cygwin
++	echo "$UNAME_MACHINE"-${VENDOR}-cygwin
+ 	exit ;;
+     *:MINGW64*:*)
+-	echo "$UNAME_MACHINE"-pc-mingw64
++	echo "$UNAME_MACHINE"-${VENDOR}-mingw64
+ 	exit ;;
+     *:MINGW*:*)
+-	echo "$UNAME_MACHINE"-pc-mingw32
++	echo "$UNAME_MACHINE"-${VENDOR}-mingw32
+ 	exit ;;
+     *:MSYS*:*)
+-	echo "$UNAME_MACHINE"-pc-msys
++	echo "$UNAME_MACHINE"-${VENDOR}-msys
+ 	exit ;;
+     i*:PW*:*)
+-	echo "$UNAME_MACHINE"-pc-pw32
++	echo "$UNAME_MACHINE"-${VENDOR}-pw32
+ 	exit ;;
+     *:Interix*:*)
+ 	case "$UNAME_MACHINE" in
+ 	    x86)
+-		echo i586-pc-interix"$UNAME_RELEASE"
++		echo i586-${VENDOR}-interix"$UNAME_RELEASE"
  		exit ;;
  	    authenticamd | genuineintel | EM64T)
 -		echo x86_64-unknown-interix"$UNAME_RELEASE"
@@ -174,28 +210,30 @@ Index: lib/config.guess
  		exit ;;
  	esac ;;
      i*:UWIN*:*)
- 	echo "$UNAME_MACHINE"-pc-uwin
+-	echo "$UNAME_MACHINE"-pc-uwin
++	echo "$UNAME_MACHINE"-${VENDOR}-uwin
  	exit ;;
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
--	echo x86_64-unknown-cygwin
+-	echo x86_64-pc-cygwin
 +	echo x86_64-${VENDOR}-cygwin
  	exit ;;
      prep*:SunOS:5.*:*)
--	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-+	echo powerpcle-${VENDOR}-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+-	echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
++	echo powerpcle-${VENDOR}-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
  	exit ;;
      *:GNU:*:*)
  	# the GNU system
--	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-+	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-${VENDOR}-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+-	echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
++	echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-${VENDOR}-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
  	exit ;;
      *:GNU/*:*:*)
  	# other systems with GNU libc and userland
--	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
-+	echo "$UNAME_MACHINE-${VENDOR}-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+-	echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC"
++	echo "$UNAME_MACHINE-${VENDOR}-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC"
  	exit ;;
-     i*86:Minix:*:*)
- 	echo "$UNAME_MACHINE"-pc-minix
+     *:Minix:*:*)
+-	echo "$UNAME_MACHINE"-unknown-minix
++	echo "$UNAME_MACHINE"-${VENDOR}-minix
  	exit ;;
      aarch64:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -207,8 +245,8 @@ Index: lib/config.guess
 +	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      alpha:Linux:*:*)
- 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -916,29 +926,29 @@ EOF
+ 	case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in
+@@ -936,29 +947,29 @@
  	esac
  	objdump --private-headers /bin/sh | grep -q ld.so.1
  	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
@@ -220,7 +258,7 @@ Index: lib/config.guess
 +	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      arm*:Linux:*:*)
- 	eval "$set_cc_for_build"
+ 	set_cc_for_build
  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
  	    | grep -q __ARM_EABI__
  	then
@@ -244,7 +282,7 @@ Index: lib/config.guess
  	exit ;;
      cris:Linux:*:*)
  	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
-@@ -947,28 +957,28 @@ EOF
+@@ -967,28 +978,28 @@
  	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
  	exit ;;
      e2k:Linux:*:*)
@@ -260,7 +298,8 @@ Index: lib/config.guess
 +	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      i*86:Linux:*:*)
- 	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      ia64:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -279,13 +318,13 @@ Index: lib/config.guess
 +	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
- 	eval "$set_cc_for_build"
-@@ -987,60 +997,60 @@ EOF
+ 	set_cc_for_build
+@@ -1035,60 +1046,60 @@
  	#endif
  EOF
- 	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
--	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
-+	test "x$CPU" != x && { echo "$CPU-${VENDOR}-linux-$LIBC"; exit; }
+ 	eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')"
+-	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
++	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-${VENDOR}-linux-$LIBCABI"; exit; }
  	;;
      mips64el:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -309,7 +348,7 @@ Index: lib/config.guess
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ 	case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in
 -	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
 -	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
 -	  *)    echo hppa-unknown-linux-"$LIBC" ;;
@@ -359,8 +398,12 @@ Index: lib/config.guess
  	exit ;;
      vax:Linux:*:*)
  	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
-@@ -1049,7 +1059,7 @@ EOF
- 	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+@@ -1104,10 +1115,10 @@
+ 		LIBCABI="$LIBC"x32
+ 	    fi
+ 	fi
+-	echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBCABI"
  	exit ;;
      xtensa*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -368,8 +411,18 @@ Index: lib/config.guess
  	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1071,16 +1081,16 @@ EOF
- 	echo "$UNAME_MACHINE"-pc-os2-emx
+@@ -1121,34 +1132,34 @@
+ 	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+ 	# Use sysv4.2uw... so that sysv4* matches it.
+-	echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
++	echo "$UNAME_MACHINE"-${VENDOR}-sysv4.2uw"$UNAME_VERSION"
+ 	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+-	echo "$UNAME_MACHINE"-pc-os2-emx
++	echo "$UNAME_MACHINE"-${VENDOR}-os2-emx
  	exit ;;
      i*86:XTS-300:*:STOP)
 -	echo "$UNAME_MACHINE"-unknown-stop
@@ -380,24 +433,68 @@ Index: lib/config.guess
 +	echo "$UNAME_MACHINE"-${VENDOR}-atheos
  	exit ;;
      i*86:syllable:*:*)
- 	echo "$UNAME_MACHINE"-pc-syllable
+-	echo "$UNAME_MACHINE"-pc-syllable
++	echo "$UNAME_MACHINE"-${VENDOR}-syllable
  	exit ;;
      i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 -	echo i386-unknown-lynxos"$UNAME_RELEASE"
 +	echo i386-${VENDOR}-lynxos"$UNAME_RELEASE"
  	exit ;;
      i*86:*DOS:*:*)
- 	echo "$UNAME_MACHINE"-pc-msdosdjgpp
-@@ -1100,7 +1110,7 @@ EOF
+-	echo "$UNAME_MACHINE"-pc-msdosdjgpp
++	echo "$UNAME_MACHINE"-${VENDOR}-msdosdjgpp
+ 	exit ;;
+     i*86:*:4.*:*)
+ 	UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//')
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ 		echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ 	else
+-		echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
++		echo "$UNAME_MACHINE"-${VENDOR}-sysv"$UNAME_REL"
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+@@ -1158,12 +1169,12 @@
  	    *Pentium)	     UNAME_MACHINE=i586 ;;
  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  	esac
--	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
-+	echo "$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+-	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
++	echo "$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}"
  	exit ;;
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
-@@ -1139,7 +1149,7 @@ EOF
+ 		UNAME_REL=$(sed -n 's/.*Version //p' </usr/options/cb.name)
+-		echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
++		echo "$UNAME_MACHINE"-${VENDOR}-isc"$UNAME_REL"
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ 		UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //'))
+ 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+@@ -1173,9 +1184,9 @@
+ 			&& UNAME_MACHINE=i686
+ 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+-		echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
++		echo "$UNAME_MACHINE"-${VENDOR}-sco"$UNAME_REL"
+ 	else
+-		echo "$UNAME_MACHINE"-pc-sysv32
++		echo "$UNAME_MACHINE"-${VENDOR}-sysv32
+ 	fi
+ 	exit ;;
+     pc:*:*:*)
+@@ -1185,10 +1196,10 @@
+ 	# Note: whatever this is, it MUST be the same as what config.sub
+ 	# prints for the "djgpp" host, or else GDB configure will decide that
+ 	# this is a cross-build.
+-	echo i586-pc-msdosdjgpp
++	echo i586-${VENDOR}-msdosdjgpp
+ 	exit ;;
+     Intel:Mach:3*:*)
+-	echo i386-pc-mach3
++	echo i386-${VENDOR}-mach3
+ 	exit ;;
+     paragon:*:*:*)
+ 	echo i860-intel-osf1
+@@ -1197,7 +1208,7 @@
  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
  	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
  	else # Add other i860-SVR4 vendors below as they are discovered.
@@ -406,7 +503,7 @@ Index: lib/config.guess
  	fi
  	exit ;;
      mini*:CTIX:SYS*5:*)
-@@ -1176,19 +1186,19 @@ EOF
+@@ -1234,19 +1245,19 @@
  	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
  	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
@@ -430,8 +527,8 @@ Index: lib/config.guess
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv"$UNAME_RELEASE"
-@@ -1238,7 +1248,7 @@ EOF
- 	if [ -d /usr/nec ]; then
+@@ -1296,7 +1307,7 @@
+ 	if test -d /usr/nec; then
  		echo mips-nec-sysv"$UNAME_RELEASE"
  	else
 -		echo mips-unknown-sysv"$UNAME_RELEASE"
@@ -439,8 +536,16 @@ Index: lib/config.guess
  	fi
  	exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-@@ -1254,7 +1264,7 @@ EOF
- 	echo i586-pc-haiku
+@@ -1306,13 +1317,13 @@
+ 	echo powerpc-apple-beos
+ 	exit ;;
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+-	echo i586-pc-beos
++	echo i586-${VENDOR}-beos
+ 	exit ;;
+     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+-	echo i586-pc-haiku
++	echo i586-${VENDOR}-haiku
  	exit ;;
      x86_64:Haiku:*:*)
 -	echo x86_64-unknown-haiku
@@ -448,7 +553,16 @@ Index: lib/config.guess
  	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux"$UNAME_RELEASE"
-@@ -1363,13 +1373,13 @@ EOF
+@@ -1390,7 +1401,7 @@
+ 	echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+ 	exit ;;
+     *:QNX:*:4*)
+-	echo i386-pc-qnx
++	echo i386-${VENDOR}-qnx
+ 	exit ;;
+     NEO-*:NONSTOP_KERNEL:*:*)
+ 	echo neo-tandem-nsk"$UNAME_RELEASE"
+@@ -1426,13 +1437,13 @@
  	else
  	    UNAME_MACHINE="$cputype"
  	fi
@@ -465,7 +579,7 @@ Index: lib/config.guess
  	exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  	echo pdp10-dec-tops20
-@@ -1378,16 +1388,16 @@ EOF
+@@ -1441,16 +1452,16 @@
  	echo pdp10-xkl-tops20
  	exit ;;
      *:TOPS-20:*:*)
@@ -480,13 +594,29 @@ Index: lib/config.guess
  	echo mips-sei-seiux"$UNAME_RELEASE"
  	exit ;;
      *:DragonFly:*:*)
--	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-+	echo "$UNAME_MACHINE"-${VENDOR}-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+-	echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
++	echo "$UNAME_MACHINE"-${VENDOR}-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')"
  	exit ;;
      *:*VMS:*:*)
- 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1409,10 +1419,10 @@ EOF
- 	echo "$UNAME_MACHINE"-pc-aros
+ 	UNAME_MACHINE=$( (uname -p) 2>/dev/null)
+@@ -1460,25 +1471,25 @@
+ 	    V*) echo vax-dec-vms ; exit ;;
+ 	esac ;;
+     *:XENIX:*:SysV)
+-	echo i386-pc-xenix
++	echo i386-${VENDOR}-xenix
+ 	exit ;;
+     i*86:skyos:*:*)
+-	echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
++	echo "$UNAME_MACHINE"-${VENDOR}-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')"
+ 	exit ;;
+     i*86:rdos:*:*)
+-	echo "$UNAME_MACHINE"-pc-rdos
++	echo "$UNAME_MACHINE"-${VENDOR}-rdos
+ 	exit ;;
+     i*86:AROS:*:*)
+-	echo "$UNAME_MACHINE"-pc-aros
++	echo "$UNAME_MACHINE"-${VENDOR}-aros
  	exit ;;
      x86_64:VMkernel:*:*)
 -	echo "$UNAME_MACHINE"-unknown-esx
@@ -496,30 +626,9 @@ Index: lib/config.guess
 -	echo x86_64-unknown-onefs
 +	echo x86_64-${VENDOR}-onefs
  	exit ;;
+     *:Unleashed:*:*)
+-	echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE"-${VENDOR}-unleashed"$UNAME_RELEASE"
+ 	exit ;;
  esac
  
-Index: lib/config.sub
-===================================================================
---- lib/config.sub.orig	2018-03-21 12:19:25.009766883 +0100
-+++ lib/config.sub	2018-03-21 12:19:27.861785205 +0100
-@@ -1138,13 +1138,19 @@
- 		cpu=nsx
- 		vendor=tandem
- 		;;
-+	s390)
-+		cpu=s390
-+		vendor=ibm
-+		;;
- 	s390-*)
- 		cpu=s390
-+		;;
-+	s390x)
-+		cpu=s390x
- 		vendor=ibm
- 		;;
- 	s390x-*)
- 		cpu=s390x
--		vendor=ibm
- 		;;
- 	tile*-*)
- 		os=${os:-linux-gnu}
diff --git a/automake-testsuite-vala-gcc10.patch b/automake-testsuite-vala-gcc10.patch
deleted file mode 100644
index 876e0f6..0000000
--- a/automake-testsuite-vala-gcc10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://lists.gnu.org/archive/html/bug-automake/2020-06/msg00003.html
-
-diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
-index 8e6a214..933a3ff 100644
---- a/t/vala-mix2.sh
-+++ b/t/vala-mix2.sh
-@@ -44,7 +44,7 @@ int main ()
- END
- 
- cat > foo.h <<'END'
--int foo;
-+extern int foo;
- int bar (void);
- int baz (void);
- END
-@@ -56,7 +56,7 @@ END
- 
- cat > baz.c <<'END'
- #include "foo.h"
--extern int foo = 0;
-+int foo = 0;
- int baz (void) { return 0; }
- END
diff --git a/automake.changes b/automake.changes
index f983651..9ec536d 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue Dec 29 13:50:22 UTC 2020 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.16.3:
+  - In the testsuite summary, the "for $(PACKAGE_STRING)" suffix
+    can be overridden with the AM_TESTSUITE_SUMMARY_HEADER variable.
+  - Python 3.10 version number no longer considered to be 3.1.
+  - Broken links in manual fixed or removed, and new script
+    contrib/checklinkx (a small modification of W3C checklink) added,
+    with accompany target checklinkx to recheck urls.
+  - install-exec target depends on $(BUILT_SOURCES).
+  - valac argument matching more precise, to avoid garbage in DIST_COMMON.
+  - Support for Vala in VPATH builds fixed so that both freshly-generated and
+    distributed C files work, and operation is more reliable with or without
+    an installed valac.
+  - Dejagnu doesn't break on directories containing spaces.
+  - new variable AM_DISTCHECK_DVI_TARGET, to allow overriding the
+    "make dvi" that is done as part of distcheck.
+  - install-sh tweaks:
+    . new option -p to preserve mtime, i.e., invoke cp -p.
+    . new option -S SUFFIX to attempt backup files using SUFFIX.
+    . no longer unconditionally uses -f when rm is overridden by RMPROG.
+    . does not chown existing directories.
+  - Removed function up_to_date_p in lib/Automake/FileUtils.pm.
+    We believe this function is completely unused.
+  - Support for in-tree Vala libraries improved.
+- rename automake-SuSE.patch to automake-suse-vendor.patch and refresh
+- remove automake-testsuite-vala-gcc10.patch (upstream)
+
 -------------------------------------------------------------------
 Fri Jul 17 09:03:35 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/automake.keyring b/automake.keyring
index 7d35960..723d70a 100644
--- a/automake.keyring
+++ b/automake.keyring
@@ -1513,7 +1513,6 @@ Dw==
 
 GPG keys of Paul Eggert <eggert>
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
 
 mQINBEyAcmQBEADAAyH2xoTu7ppG5D3a8FMZEon74dCvc4+q1XA2J2tBy2pwaTqf
 hpxxdGA9Jj50UJ3PD4bSUEgN8tLZ0san47l5XTAFLi2456ciSl5m8sKaHlGdt9Xm
@@ -1526,43 +1525,194 @@ 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
-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
-WtkGoi8buNcby4U=
-=AL6o
+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
+Ck90PXknuFDDsYHfDo5smf9lo6YXx7N9
+=QLCc
+-----END PGP PUBLIC KEY BLOCK-----
+
+GPG keys of Zack Weinberg <zackw>
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=aesZ
 -----END PGP PUBLIC KEY BLOCK-----
 
 GPG keys of Mathieu Lirzin <mthl>
diff --git a/automake.spec b/automake.spec
index d40e99e..ec4a45e 100644
--- a/automake.spec
+++ b/automake.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package automake
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
 %define nsuffix %{nil}
 %endif
 Name:           automake%{nsuffix}
-Version:        1.16.2
+Version:        1.16.3
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
@@ -42,8 +42,7 @@ Source3:        automake-rpmlintrc
 Patch2:         automake-require_file.patch
 Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
 Patch5:         0001-correct-parameter-parsing-in-test-driver-script.patch
-Patch6:         automake-testsuite-vala-gcc10.patch
-Patch100:       automake-SuSE.patch
+Patch100:       automake-suse-vendor.patch
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
 BuildRequires:  gcc-c++
@@ -59,6 +58,7 @@ BuildArch:      noarch
 %if "%{flavor}" == "testsuite"
 BuildRequires:  cscope
 BuildRequires:  dejagnu
+BuildRequires:  etags
 BuildRequires:  expect
 BuildRequires:  flex
 BuildRequires:  gettext-tools
@@ -69,7 +69,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  sharutils
 BuildRequires:  zip
-BuildRequires:  etags
 Requires:       expect
 Requires:       flex
 Requires:       libtool
@@ -90,8 +89,7 @@ definitions (with rules occasionally thrown in).  The generated
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
-%patch6 -p1
-%patch100
+%patch100 -p1
 
 %build
 sh bootstrap

From e9c33f495e90f1c52b58cbc87d01c4e96e29c723ca529f62a32dfc81619c7edc Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 17 Jan 2021 18:43:32 +0000
Subject: [PATCH 2/2] - add fix-testsuite-failures-with-autoconf270.patch to
 fix compatibility   with autoconf 2.70

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=84
---
 automake.changes                              |   6 ++
 automake.spec                                 |   3 +
 fix-testsuite-failures-with-autoconf270.patch | 101 ++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 fix-testsuite-failures-with-autoconf270.patch

diff --git a/automake.changes b/automake.changes
index 9ec536d..10dc0df 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jan 17 18:42:38 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- add fix-testsuite-failures-with-autoconf270.patch to fix compatibility
+  with autoconf 2.70 
+
 -------------------------------------------------------------------
 Tue Dec 29 13:50:22 UTC 2020 - Dirk Müller <dmueller@suse.com>
 
diff --git a/automake.spec b/automake.spec
index ec4a45e..e9b116e 100644
--- a/automake.spec
+++ b/automake.spec
@@ -39,9 +39,11 @@ Source2:        https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=au
 Source3:        automake-rpmlintrc
 #Source4:        http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 #Source5:        http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+Patch1:         https://git.savannah.gnu.org/cgit/automake.git/patch/?id=ccb57553e3433df3e52e534e6f87915db23ff9a5#/fix-testsuite-failures-with-autoconf270.patch
 Patch2:         automake-require_file.patch
 Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
 Patch5:         0001-correct-parameter-parsing-in-test-driver-script.patch
+
 Patch100:       automake-suse-vendor.patch
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
@@ -86,6 +88,7 @@ definitions (with rules occasionally thrown in).  The generated
 
 %prep
 %setup -q -n automake-%{version}
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
diff --git a/fix-testsuite-failures-with-autoconf270.patch b/fix-testsuite-failures-with-autoconf270.patch
new file mode 100644
index 0000000..2e80929
--- /dev/null
+++ b/fix-testsuite-failures-with-autoconf270.patch
@@ -0,0 +1,101 @@
+From ccb57553e3433df3e52e534e6f87915db23ff9a5 Mon Sep 17 00:00:00 2001
+From: Zack Weinberg <zackw@panix.com>
+Date: Mon, 14 Dec 2020 14:50:47 -0500
+Subject: Fix some build and test failures with Autoconf 2.70.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Autoconf 2.70 (released last week) makes a few changes that broke Automake’s
+expectations, mostly in the test suite.  This patch addresses two of the
+problems:
+
+ - autoconf now issues a warning if fed a configure script that doesn’t invoke
+   both AC_INIT and AC_OUTPUT; this, plus a problem with system-provided
+   tools (still under investigation) broke the *build* on macOS; it also
+   causes a couple of spurious testsuite failures.
+
+ - AC_PACKAGE_NAME and AC_PACKAGE_VERSION are now defined unconditionally.
+   AM_INIT_AUTOMAKE needs to use m4_ifset instead of m4_ifdef to diagnose
+   the obsolete use of AC_INIT with fewer than two arguments.  (This change
+   is compatible with autoconf 2.69; m4_ifset is much older, and it means
+   ‘defined with a non-empty value’.)
+
+* configure.ac: Use both AC_INIT and AC_OUTPUT in test configure scripts.
+* t/deprecated-acinit.sh, t/init.sh: Likewise.
+* m4/init.m4 (AM_INIT_AUTOMAKE): Use m4_ifset, not m4_ifdef, to detect
+  AC_PACKAGE_NAME and/or AC_PACKAGE_VERSION not having a value.
+---
+ configure.ac           | 9 +++++++--
+ m4/init.m4             | 2 +-
+ t/deprecated-acinit.sh | 1 +
+ t/init.sh              | 1 +
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 45507b6f4..065317411 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,7 +123,9 @@ fi
+ 
+ AC_CACHE_CHECK([whether autoconf works], [am_cv_autoconf_works],
+ [mkdir conftest
+-echo 'AC''_INIT' > conftest/conftest.ac
++printf '%s\n' > conftest/conftest.ac \
++  'AC''_INIT([smoke-test], [1])' \
++  'AC''_OUTPUT'
+ if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
+ then
+   am_cv_autoconf_works=yes
+@@ -139,7 +141,10 @@ fi
+ AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
+ [mkdir conftest
+ dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro
+-echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac
++printf '%s\n' > conftest/conftest.ac \
++  'AC'"_PREREQ([[$required_autoconf_version]])" \
++  'AC''_INIT([smoke-test], [1])' \
++  'AC''_OUTPUT'
+ if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]);
+ then
+   am_cv_autoconf_version=yes
+diff --git a/m4/init.m4 b/m4/init.m4
+index f82d756c2..cbe8fddf8 100644
+--- a/m4/init.m4
++++ b/m4/init.m4
+@@ -64,7 +64,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ [_AM_SET_OPTIONS([$1])dnl
+ dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+ m4_if(
+-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
++  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
+   [ok:ok],,
+   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
+index 21614bafa..f393d6534 100644
+--- a/t/deprecated-acinit.sh
++++ b/t/deprecated-acinit.sh
+@@ -35,6 +35,7 @@ for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do
+         $ac_init
+         $am_init_automake
+         AC_CONFIG_FILES([Makefile])
++        AC_OUTPUT
+ END
+     cat configure.ac # For debugging.
+     $ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
+diff --git a/t/init.sh b/t/init.sh
+index c6f6d6461..df138a040 100644
+--- a/t/init.sh
++++ b/t/init.sh
+@@ -25,6 +25,7 @@ for ac_init_args in '' '([x])'; do
+     unindent >configure.ac <<END
+       AC_INIT$ac_init_args
+       AM_INIT_AUTOMAKE$am_init_args
++      AC_OUTPUT
+ END
+     cat configure.ac # For debugging.
+     # The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
+-- 
+cgit v1.2.1
+