18 changed files with 3549 additions and 1832 deletions
--- a/.automake.metadata
+++ b/.automake.metadata
@ -0,0 +1 @@
+1012bc79956013d53da0890f8493388a6cb20831 SOURCES/automake-1.16.1.tar.xz
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1 @@
-/automake-1.16.1.tar.xz
-/automake-1.16.2.tar.xz
-/automake-1.16.3.tar.xz
-/automake-1.16.4.tar.xz
-/automake-1.16.5.tar.xz
+SOURCES/automake-1.16.1.tar.xz
--- a/0001-test-avoid-apostrophe-in-test-document.patch
+++ b/0001-test-avoid-apostrophe-in-test-document.patch
@ -1,51 +0,0 @@
-From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001
-From: Karl Berry <karl@freefriends.org>
-Date: Mon, 12 Dec 2022 14:50:33 -0800
-Subject: [PATCH] test: avoid apostrophe in test document.
-
-From automake patch https://bugs.gnu.org/59989
-(though a different solution), suggestion by Frederic Berat.
-
-* t/txinfo-include.sh: avoid apostrophes in test document,
-since Texinfo 7.0 turns them into UTF-8 by default.
---
- t/txinfo-include.sh | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
-index 8a15f01b0..10fff0753 100644
--- a/t/txinfo-include.sh
-+++ b/t/txinfo-include.sh
-@@ -28,6 +28,9 @@ main_TEXINFOS = one.texi two.texi three.texi
- sub_more_TEXINFOS = sub/desc.texi sub/hist.texi
- END
- 
-+# We avoid apostrophes in the test document since Texinfo
-+# turns them into UTF-8, which is not easy to grep.
-+#
- cat > main.texi << 'END'
- \input texinfo
- @setfilename main.info
-@@ -61,8 +64,8 @@ END
- 
- cat > three.texi << 'END'
- @node three
-@chapter Chapter two
-GNU's Not Unix.
-+@chapter Chapter three
-+Quux quux quux.
- END
- 
- mkdir sub
-@@ -106,7 +109,7 @@ check_info_contents ()
-   srcdir=${1-.}
-   $FGREP "Foo bar, baz."                        $srcdir/main.info
-   $FGREP "Blah Blah Blah."                      $srcdir/main.info
-  $FGREP "GNU's Not Unix."                      $srcdir/main.info
-+  $FGREP "Quux quux quux."                      $srcdir/main.info
-   $FGREP 'It does something, really.'           $srcdir/sub/more.info
-   $FGREP 'It was written somehow.'              $srcdir/sub/more.info
- }
-- 
-2.39.0
-
--- a/0001-tests-Fix-type-defaults-error-in-link_cond-due-to-ma.patch
+++ b/0001-tests-Fix-type-defaults-error-in-link_cond-due-to-ma.patch
@ -1,31 +0,0 @@
-From 2a9908da9dbc075ee6c4e853cf3be0365b15f202 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
-Date: Mon, 12 Dec 2022 08:05:53 +0100
-Subject: [PATCH] tests: Fix 'type defaults' error in link_cond due to main not
- being properly declared
-
-This is related to an effort to prepare Automake for future GCC/Clang
-versions which set c99 as default standard to be used.
-Not properly declaring main as "int main(...)" is rejected since c99.
-
-* t/link_cond.sh: Add (void) to main definition.
---
- t/link_cond.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/link_cond.sh b/t/link_cond.sh
-index 45d0d7f40..889623131 100644
--- a/t/link_cond.sh
-+++ b/t/link_cond.sh
-@@ -52,7 +52,7 @@ $AUTOCONF
- rm -f *.c++
- cat > less.c <<'END'
- /* Valid C but deliberately invalid C++ */
-main ()
-+int main (void)
- {
-   int new = 0;
-   return new;
-- 
-2.39.1
-
--- a/0001-tests-depcomp-ensure-make_ok-fails-when-run_make-fai.patch
+++ b/0001-tests-depcomp-ensure-make_ok-fails-when-run_make-fai.patch
@ -1,34 +0,0 @@
-From 6d6fc91c472fd84bd71a1b012fa9ab77bd94efea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
-Date: Mon, 12 Dec 2022 07:32:13 +0100
-Subject: [PATCH] tests: depcomp: ensure make_ok() fails when run_make fails
-
-While running automake tests with -std-gnu=c99, the compiler report
-errors which lead to make to fail. Yet, these failures are ignored
-during the tests, which considers them to be successful as stderror is
-check for one specific pattern.
-
-If make fails, investigation should be made to discover why, whatever
-the reason for the failure is.
-
-* t/ax/depcomp.sh: Make make_ok fail when make fails.
---
- t/ax/depcomp.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
-index 3c4db10e3..7a3ac63a7 100644
--- a/t/ax/depcomp.sh
-+++ b/t/ax/depcomp.sh
-@@ -160,7 +160,7 @@ case $depcomp_with_libtool in
-     echo lib_LTLIBRARIES = libfoo.la >> Makefile.am
-     make_ok ()
-     {
-      run_make -M -- ${1+"$@"}
-+      run_make -M -- ${1+"$@"} || return 1
-       $FGREP 'unknown directive' output && return 1
-       rm -f output
-       # Checks for stray files possibly left around by less common
-- 
-2.39.1
-
--- a/SOURCES/0001-python-add-3.10-3.15-to-the-version-search-list.patch
+++ b/SOURCES/0001-python-add-3.10-3.15-to-the-version-search-list.patch
@ -0,0 +1,37 @@
+From 930a9a73f4bb776ec334eff4cf6e182802841daa Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 26 Jan 2022 06:33:19 -0500
+Subject: [PATCH] python: add 3.10 - 3.15 to the version search list
+
+Fixes automake bug https://bugs.gnu.org/53530.
+
+Based on the cadence of Automake releases, add the current Python
+release (3.10), the current Python development (3.11), and then 4
+more versions on top of that.  It doesn't hurt to check for a few
+extra versions here since this is the fallback logic when the main
+`python` and `python3` programs aren't found.
+
+* m4/python.m4: Add python3.10 - python3.15.
+* NEWS: Mention new Python versions.
+
+Conflicts:
+ - NEWS (removed)
+---
+ m4/python.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/m4/python.m4 b/m4/python.m4
+index 4a007fd75..4bf72286a 100644
+--- a/m4/python.m4
+++ b/m4/python.m4
+@@ -38,6 +38,7 @@ AC_DEFUN([AM_PATH_PYTHON],
+   dnl supported. (2.0 was released on October 16, 2000).
+   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+ [python python2 python3 dnl
+ python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl
+  python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl
+  python3.2 python3.1 python3.0 dnl
+  python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl
+-- 
+2.41.0
+
--- a/SOURCES/automake-1.15-disable-vala-tests.patch
+++ b/SOURCES/automake-1.15-disable-vala-tests.patch
@ -0,0 +1,28 @@
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Tue, 7 Jul 2015 11:46:24 +0200
+Subject: [PATCH] tests: disable vala testcases
+
+Currently broken vala installation in Fedora?  Upstream thread:
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12522
+
+diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
+index 9363ee3..b99f15c 100644
+--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
+@@ -1239,16 +1239,6 @@ t/upc2.sh \
+ t/upc3.sh \
+ t/vala-configure.sh \
+ t/vala-grepping.sh \
+-t/vala-headers.sh \
+-t/vala-libs.sh \
+-t/vala-mix.sh \
+-t/vala-mix2.sh \
+-t/vala-non-recursive-setup.sh \
+-t/vala-parallel.sh \
+-t/vala-per-target-flags.sh \
+-t/vala-recursive-setup.sh \
+-t/vala-vapi.sh \
+-t/vala-vpath.sh \
+ t/vars.sh \
+ t/vars3.sh \
+ t/var-recurs.sh \
--- a/SOURCES/automake-1.16-pep3147-tweak-fix.patch
+++ b/SOURCES/automake-1.16-pep3147-tweak-fix.patch
@ -0,0 +1,48 @@
+diff --git a/lib/am/python.am b/lib/am/python.am
+index 21e6f842c..e29ecfcd0 100644
+--- a/lib/am/python.am
+++ b/lib/am/python.am
+@@ -97,7 +97,7 @@ endif %?INSTALL%
+ if %?INSTALL%
+ 
+ ?FIRST?am__pep3147_tweak = \
+-?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
+?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|'
+ 
+ .PHONY uninstall-am: uninstall-%DIR%PYTHON
+ uninstall-%DIR%PYTHON:
+@@ -108,19 +108,26 @@ uninstall-%DIR%PYTHON:
+ 	test -n "$$py_files" || exit 0; \
+ 	dir='$(DESTDIR)$(%NDIR%dir)'; \
+ ## Also remove the .pyc and .pyo byte compiled versions.
+## This is somewhat tricky, because for newer pythons we have to take
+## PEP-3147 into account.
+ 	pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
+ 	pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
+	py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \
+	echo "$$py_files_pep3147";\
+	pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \
+	pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \
+ 	st=0; \
+-	for files in "$$py_files" "$$pyc_files" "$$pyo_files"; do \
+	for files in \
+	  "$$py_files" \
+	  "$$pyc_files" \
+	  "$$pyo_files" \
+## Installation of '.py' files is not influenced by PEP-3147, so it
+## is correct *not* to have $pyfiles_pep3147 here.
+	  "$$pyc_files_pep3147" \
+	  "$$pyo_files_pep3147" \
+	; do \
+ 	  $(am__uninstall_files_from_dir) || st=$$?; \
+ 	done; \
+-## This is somewhat tricky, because for newer pythons we have to take PEP-3147
+-## into account.  Avoid exceeding the command-line length limit.
+-	dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \
+-	echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \
+-	  while read files; do \
+-	    $(am__uninstall_files_from_dir) || st=$$?; \
+-	  done || exit $$?; \
+ 	exit $$st
+ endif %?INSTALL%
+ 
--- a/SOURCES/automake-1.16.1-python-version-multiple-digits.patch
+++ b/SOURCES/automake-1.16.1-python-version-multiple-digits.patch
@ -0,0 +1,86 @@
+From e21d46fddd0753e66a4acda88317670fee07f3e6 Mon Sep 17 00:00:00 2001
+From: "Miro Hron\\v{c}ok" <miro@hroncok.cz>
+Date: Tue, 27 Oct 2020 14:33:46 -0700
+Subject: [PATCH] python: determine Python (3.10) version number correctly.
+
+This change fixes https://bugs.gnu.org/44239
+(and https://bugzilla.redhat.com/show_bug.cgi?id=1889732).
+
+* m4/python.m4: use print('%u.%u' % sys.version_info[:2]) for
+the version number instead of merely sys.version[:3], so the
+numbers are treated as numbers.
+* t/python-vars.sh (PYTHON_VERSION): Likewise.
+* doc/automake.texi: Document it.
+* NEWS: mention it. (Minor tweaks from Karl Berry.)
+
+Conflicts:
+ - NEWS (Removed)
+---
+ doc/automake.texi |  2 +-
+ m4/python.m4      | 12 +++++++-----
+ t/python-vars.sh  |  4 +++-
+ 3 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/doc/automake.texi b/doc/automake.texi
+index 2df214a01..1b9d5d0f6 100644
+--- a/doc/automake.texi
+++ b/doc/automake.texi
+@@ -7761,7 +7761,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+ @item PYTHON_VERSION
+ The Python version number, in the form @var{major}.@var{minor}
+ (e.g., @samp{2.5}).  This is currently the value of
+-@samp{sys.version[:3]}.
+@samp{'%u.%u' % sys.version_info[:2]}.
+ 
+ @item PYTHON_PREFIX
+ The string @samp{$@{prefix@}}.  This term may be used in future work
+diff --git a/m4/python.m4 b/m4/python.m4
+index 63c0a0e04..4a007fd75 100644
+--- a/m4/python.m4
+++ b/m4/python.m4
+@@ -1,7 +1,7 @@
+ ## ------------------------                                 -*- Autoconf -*-
+ ## Python file handling
+ ## From Andrew Dalke
+-## Updated by James Henstridge
+## Updated by James Henstridge and other contributors.
+ ## ------------------------
+ # Copyright (C) 1999-2018 Free Software Foundation, Inc.
+ #
+@@ -86,12 +86,14 @@ AC_DEFUN([AM_PATH_PYTHON],
+     m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+   else
+ 
+-  dnl Query Python for its version number.  Getting [:3] seems to be
+-  dnl the best way to do this; it's what "site.py" does in the standard
+-  dnl library.
+  dnl Query Python for its version number.  Although site.py simply uses
+  dnl sys.version[:3], printing that failed with Python 3.10, since the
+  dnl trailing zero was eliminated. So now we output just the major
+  dnl and minor version numbers, as numbers. Apparently the tertiary
+  dnl version is not of interest.
+ 
+   AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+-    [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
+    [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
+   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+ 
+   dnl Use the values of $prefix and $exec_prefix for the corresponding
+diff --git a/t/python-vars.sh b/t/python-vars.sh
+index 51107be48..13616101a 100644
+--- a/t/python-vars.sh
+++ b/t/python-vars.sh
+@@ -28,7 +28,9 @@ CONFIG_SITE=/dev/null; export CONFIG_SITE
+ # vary among different python installations, so we need more relaxed
+ # and ad-hoc checks for them.  Also, more proper "functional" checks
+ # on them should be done in the 'python-virtualenv.sh' test.
+-PYTHON_VERSION=$($PYTHON -c 'import sys; print(sys.version[:3])') || exit 1
+# 
+# This version identification is duplicated in python.m4 (and the manual).
+PYTHON_VERSION=$($PYTHON -c 'import sys; print("%u.%u" % sys.version_info[:2])') || exit 1
+ PYTHON_PLATFORM=$($PYTHON -c 'import sys; print(sys.platform)') || exit 1
+ PYTHON_EXEC_PREFIX='${exec_prefix}'
+ PYTHON_PREFIX='${prefix}'
+-- 
+2.41.0
+
--- a/SOURCES/config.guess
+++ b/SOURCES/config.guess
--- a/SOURCES/config.sub
+++ b/SOURCES/config.sub
--- a/SPECS/automake.spec
+++ b/SPECS/automake.spec
@ -1,16 +1,5 @@
 %global api_version 1.16

-# redhat-rpm-config sets CFLAGS, CXXFLAGS and LDFLAGS, but not
-# OBJCFLAGS. This means that Obj-C tests will be compiled without hardening
-# flags, and then fail when linked with the hardened linker flags.
-# We therefore need to disable build flags to be able to test automake itself.
-# Since the automake executables are all interpreted languages, they aren't
-# compiled and so the build flags only affect the tests anyway.
-%undefine _auto_set_build_flags
-
-# do not mangle shebang in files which are part of bootstraped project
-%global __brp_mangle_shebangs_exclude_from /usr/share/automake-%{api_version}
-
 # run "make check" by default
 %bcond_without check
 # Run optional test
@ -21,59 +10,32 @@

 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
-# Any bump here requires libtool rebuild, rhbz#1813010
-Version:    %{api_version}.5
-Release:    18%{?dist}
+Version:    %{api_version}.1
+Release:    8%{?dist}

-# To help future rebase, the following licenses were seen in the following files/folders:
-# usr/bin/* - GPL-2.0-or-later
-# usr/share/aclocal-1.16/* - FSFULLR
-# usr/share/automake-1.16:
-#   Automake/Getopt.pm - GPL-3.0-or-later
-#   Automake/* - GPL-2.0-or-later
-#   am/* - GPL-2.0-or-later
-#   INSTALL - FSFAP
-#   install-sh - X11 AND LicenseRef-Fedora-Public-Domain (added by autoconf)
-#   mkinstalldirs - LicenseRef-Fedora-Public-Domain
-#   config.{guess,sub} - GPL-3.0-or-later WITH Autoconf-exception-generic-3.0
-#   texinfo.tex - GPL-3.0-or-later WITH Texinfo-exception
-#   * - GPL-2.0-or-later WITH Autoconf-exception-generic
-# usr/share/doc/automake:
-#   {NEWS,README} - GPL-2.0-or-later
-#   amhello-1.0.tar:
-#     src/Makefile.in - FSFULLRWD
-#     src/* - FSFUL
-#     {Makefile.in,aclocal.m4} - FSFULLRWD
-#     {Makefile.am,configure,configure.ac} - FSFUL
-#     {compile,depcomp,missing} - GPL-2.0-or-later WITH Autoconf-exception-generic
-#     install-sh - X11 AND LicenseRef-Fedora-Public-Domain (added by autoconf)
-# usr/share/info:
-#  * - GFDL-1.3-or-later
-# usr/share/man/man1/*: generated from usr/bin/{aclocal,automake} using help2man
-License:    GPL-2.0-or-later AND GPL-2.0-or-later WITH Autoconf-exception-generic AND GPL-3.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND GPL-3.0-or-later WITH Texinfo-exception AND GFDL-1.3-or-later AND FSFAP AND FSFUL AND FSFULLR AND FSFULLRWD AND X11 AND LicenseRef-Fedora-Public-Domain
+# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
+License:    GPLv2+ and GFDL and Public Domain and MIT

 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
+Source2:    http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+Source3:    http://git.savannah.gnu.org/cgit/config.git/plain/config.guess

-# ~> downstream
-# The patch is only made necessary due to fedora specific changes
-# which lead to .package_note-automake-1.16.5-3.fc36.x86_64.ld
-# being inserted in build logs, breaking the original grep instruction
-Patch0: fort2.patch
+# Keep those patches in 'git format-patch' format (with docs).

-# From upstream: ed1368e8803e8934a8bbab52a38753484dba2a37
-Patch1: 0001-test-avoid-apostrophe-in-test-document.patch
-# From upstream: 2a9908da9dbc075ee6c4e853cf3be0365b15f202
-Patch2: 0001-tests-Fix-type-defaults-error-in-link_cond-due-to-ma.patch
-# Proposed upstream: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59993#23
-Patch3: v2-0002-tests-Fix-implicit-function-declaration-errors.patch
-# Proposed upstream: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60962#5
-Patch4: v3-0003-tests-Fix-implicit-function-declaration-in-ax-dep.patch
-# Proposed upstream: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59994#29
-Patch5: v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch

-# From upstream: 6d6fc91c472fd84bd71a1b012fa9ab77bd94efea
-# Reveals failures due to C99 porting that wouldn't be seen otherwise
-Patch6: 0001-tests-depcomp-ensure-make_ok-fails-when-run_make-fai.patch
+%if %{with check} && !%{without automake_enables_optional_test}
+Patch0:     automake-1.15-disable-vala-tests.patch
+%endif
+
+# BZ#1759942
+# automake bug#31222 - Don't use '\n' in sed substitution
+# http://git.savannah.gnu.org/cgit/automake.git/commit/?id=a348d830659fffd2cfc42994524783b07e69b4b5
+Patch1:     automake-1.16-pep3147-tweak-fix.patch
+
+# BZ#2209821
+# Backport fixes for automake bugs 44239 and 53530
+Patch2:     automake-1.16.1-python-version-multiple-digits.patch
+Patch3:     0001-python-add-3.10-3.15-to-the-version-search-list.patch

 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
@ -97,26 +59,14 @@ BuildArch:  noarch
 # for better tests coverage:
 %if %{with check}
 %if %{with automake_enables_optional_test}
-BuildRequires: automake
-BuildRequires: bison
-BuildRequires: cscope
-BuildRequires: dejagnu
-BuildRequires: emacs
-BuildRequires: expect
-BuildRequires: flex
-BuildRequires: gcc-gfortran
-BuildRequires: gettext-devel
-BuildRequires: libtool
-BuildRequires: ncompress
-BuildRequires: sharutils
-BuildREquires: texlive-dvips
-BuildRequires: texinfo-tex
-BuildRequires: vala
+BuildRequires: automake libtool gettext-devel flex bison texinfo-tex texlive-dvips
+BuildRequires: java-devel-openjdk gcc-gfortran
+BuildRequires: dejagnu expect emacs vala
+BuildRequires: cscope ncompress sharutils
 %if !0%{?rhel:1}
-BuildRequires: gcc-objc
-BuildRequires: gcc-objc++
-BuildRequires: imake
 BuildRequires: lzip
+BuildRequires: gcc-objc gcc-objc++
+BuildRequires: imake
 %endif
 %endif
 %endif
@ -140,19 +90,24 @@ Makefiles.
 autoreconf -iv
 %endif

+for file in %SOURCE2 %SOURCE3; do
+    for dest in $(find -name "$(basename "$file")"); do
+        cp "$file" "$dest"
+    done
+done
+

 %build
-# redhat-rpm-config package, which provides this configure macro, will overwrite
-# the config.sub and config.guess files intentionally. The automake maintainer
-# needs to check that those files are provided up to date.
+# disable replacing config.guess and config.sub from redhat-rpm-config
+%global _configure_gnuconfig_hack 0
 %configure
-%make_build
+make %{?_smp_mflags}
 cp m4/acdir/README README.aclocal
 cp contrib/multilib/README README.multilib


 %install
-%make_install
+make install DESTDIR=%{buildroot}


 %check
@ -177,109 +132,12 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \


 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.16.5-18
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Wed Jun 28 2023 Frederic Berat <fberat@redhat.com> - 1.16.1-8
+- Fix support for detection of python 3.1x (RHBZ#2209821)

-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.16.5-17
- Bump release for June 2024 mass rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Aug 07 2023 Frederic Berat <fberat@redhat.com> - 1.16.5-14
- Migrate to SPDX licenses (#2222090)
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Feb 14 2023 Frederic Berat <fberat@redhat.com> - 1.16.5-12
- Port to modern C: various fixes
-
-* Fri Jan 20 2023 Frederic Berat <fberat@redhat.com> - 1.16.5-11
- Fix test failure due to texinfo 7.0 update
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Aug 03 2022 Frederic Berat <fberat@redhat.com> - 1.16.5-9
- Fix tests environment failures due to LDFLAGS being set globally
- Remove ExclusiveArch as there is no java dependency anymore
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 12 2022 Frederic Berat <fberat@redhat.com> - 1.16.5-7
- Remove java-devel from test related BuildRequires
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.16.5-6
- Rebuilt for Drop i686 JDKs
-
-* Tue May 17 2022 Frederic Berat <fberat@redhat.com> - 1.16.5-5
- Fix fort2.sh test
- Remove external config.sub and config.guess as they are overwritten anyway
-
-* Mon Feb 07 2022 Frederic Berat <fberat@redhat.com> - 1.16.5-4
- Switch to java-devel as a build requirement (#2051135)
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.16.5-3
- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Oct 04 2021 Ondrej Dubaj <odubaj@redhat.com> - 1.16.5-1
- Rebase to upstream version 1.16.5
-
-* Tue Jul 27 2021 Ondrej Dubaj <odubaj@redhat.com> - 1.16.4-1
- Rebase to upstream version 1.16.4
-
-* Tue Jul 27 2021 Ondrej Dubaj <odubaj@redhat.com> - 1.16.3-1
- Rebase to upstream version 1.16.3
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.16.2-3
- Support multiple digits in Python version, e.g. Python 3.10
- Fixes: rhbz#1889732
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Apr 21 2020 Patrik Novotný <panovotn@redhat.com> - 1.16.2-1
- Rebase to upstream version 1.16.2
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jun 18 2019 Patrik Novotný <panovotn@redhat.com> - 1.16.1-12
- Fix patch for pep3147 tweak
-
-* Tue Jun 04 2019 Patrik Novotný <panovotn@redhat.com> - 1.16.1-11
+* Tue May 05 2020 Patrik Novotný <panovotn@redhat.com> - 1.16.1-7
 - Upstream patch fixing automake bug#31222

-* Mon May 13 2019 Jakub Janco <jjanco@redhat.com> - 1.16.1-10
- do not mangle shebang in files which are part of bootstraped project
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Oct 12 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-8
- split BR to separate lines, use %%make_* macros
-
-* Mon Sep 17 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-7
- update config.{guess,sub} to gnuconfig git HEAD
-
 * Wed Aug 15 2018 Pavel Raiskup <praiskup@redhat.com> - 1.16.1-6
 - BR imake for tests only on Fedora

--- a/fort2.patch
+++ b/fort2.patch
@ -1,16 +0,0 @@
-diff -r -U5 automake-1.16.5.old/t/fort2.sh automake-1.16.5/t/fort2.sh
--- automake-1.16.5.old/t/fort2.sh	2022-05-16 15:12:39.683825720 +0200
-+++ automake-1.16.5/t/fort2.sh	2022-05-16 15:12:53.495805448 +0200
-@@ -80,11 +80,11 @@
- grep ' fake-fc .* --@08 .* greets\.f08 ' out
- grep ' fake-fc .* --@08 .* sub/bonjour\.f08 ' out
- grep ' fake-fc .* --gby .* --@95 .*[` ]bye\.f95 ' out
- grep ' fake-fc .* --gby .* --@90 .*[` ]sub/baz\.f90 ' out
- 
-test $(grep -c '.*--gby.*\.f' out) -eq 2
-+test $(grep -cE '.*--gby.*bye\.f95|--gby.*baz\.f90' out) -eq 2
- 
- $EGREP 'fake-fc.*--@(95|03|08).*\.f90' out && exit 1
- $EGREP 'fake-fc.*--@(90|03|08).*\.f95' out && exit 1
- $EGREP 'fake-fc.*--@(90|95|08).*\.f03' out && exit 1
- $EGREP 'fake-fc.*--@(95|95|03).*\.f08' out && exit 1
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
--- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (automake-1.16.5.tar.xz) = 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
--- a/v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch
+++ b/v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch
--- a/v2-0002-tests-Fix-implicit-function-declaration-errors.patch
+++ b/v2-0002-tests-Fix-implicit-function-declaration-errors.patch
@ -1,265 +0,0 @@
-From 38f4f6dcdb907e0006a8e83246e010d5d5cad98d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
-Date: Thu, 8 Dec 2022 10:09:14 +0100
-Subject: [PATCH v2 2/3] tests: Fix implicit function declaration errors
-In-Reply-To: <20221212070554.1635775-3-fberat@redhat.com>
-
-Changes from v1:
-  Modifications to "t/ax/depcomp.sh" have been moved to a dedicated patch
-
-- 8< --
-
-This is related to an effort to prepare Automake for future GCC/Clang
-versions which set c99 as default standard to be used.
-
-Function should be properly declared prior to use in order to be
-compatible with c99 standard.
-This is valid for both local functions and standard functions (as
-printf).
-
-Modified files:
-
- * t/c-demo.sh
- * t/cond35.sh
- * t/dist-vs-built-sources.sh
- * t/lex-clean.sh
- * t/lex-multiple.sh
- * t/lex-nodist.sh
- * t/ltcond2.sh
- * t/ltconv.sh
- * t/subobj-clean-lt-pr10697.sh
- * t/subobj-clean-pr10697.sh
- * t/tags-pr12372.sh
- * t/yacc-basic.sh
- * t/yacc-clean.sh
- * t/yacc-nodist.sh
---
- t/c-demo.sh                  |  1 +
- t/cond35.sh                  |  2 ++
- t/dist-vs-built-sources.sh   |  1 +
- t/lex-clean.sh               |  1 +
- t/lex-multiple.sh            |  4 ++++
- t/lex-nodist.sh              |  2 ++
- t/ltcond2.sh                 |  2 ++
- t/ltconv.sh                  |  6 ++++++
- t/subobj-clean-lt-pr10697.sh | 10 +++++++++-
- t/subobj-clean-pr10697.sh    | 10 +++++++++-
- t/tags-pr12372.sh            |  3 ++-
- t/yacc-basic.sh              |  1 +
- t/yacc-clean.sh              |  4 ++++
- t/yacc-nodist.sh             |  2 ++
- 14 files changed, 46 insertions(+), 3 deletions(-)
-
-diff --git a/t/c-demo.sh b/t/c-demo.sh
-index 7e0e8d64f..d25bf214b 100644
--- a/t/c-demo.sh
-+++ b/t/c-demo.sh
-@@ -113,6 +113,7 @@ test -f build-aux/compile # We have per-target flags on C sources.
- ./configure --enable-dependency-tracking
- 
- cat > src/main.c << 'END'
-+#include <stdio.h>
- #include "foo.h"
- #include "bar.h"
- int main (void)
-diff --git a/t/cond35.sh b/t/cond35.sh
-index 215a22548..bad133970 100644
--- a/t/cond35.sh
-+++ b/t/cond35.sh
-@@ -73,6 +73,8 @@ END
- 
- cat > tparse.y << 'END'
- %{
-+extern int yylex(void);
-+
- void yyerror (const char *s) {}
- %}
- %token EOF
-diff --git a/t/dist-vs-built-sources.sh b/t/dist-vs-built-sources.sh
-index d038e66dd..db2776f9a 100644
--- a/t/dist-vs-built-sources.sh
-+++ b/t/dist-vs-built-sources.sh
-@@ -41,6 +41,7 @@ foo_SOURCES = foo.c
- END
- 
- cat > foo.c << 'END'
-+#include <stdio.h>
- #include "h.h"
- int main (void) { printf ("%s\n", F); return 0; }
- END
-diff --git a/t/lex-clean.sh b/t/lex-clean.sh
-index 5aa199338..e53da8fd2 100644
--- a/t/lex-clean.sh
-+++ b/t/lex-clean.sh
-@@ -61,6 +61,7 @@ cat > lexer.l << 'END'
- END
- 
- cat > main.c << 'END'
-+extern int yylex (void);
- int main (void)
- {
-   return yylex ();
-diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh
-index 2655b633e..bf119ec84 100644
--- a/t/lex-multiple.sh
-+++ b/t/lex-multiple.sh
-@@ -56,6 +56,10 @@ cat > main.c << 'END'
- #include <stdlib.h>
- #include <string.h>
- 
-+extern int yylex (void);
-+extern int foolex (void);
-+extern int bar_lex (void);
-+
- int main (int argc, char *argv[])
- {
-   if (argc != 2)
-diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
-index 599539405..187dd5437 100644
--- a/t/lex-nodist.sh
-+++ b/t/lex-nodist.sh
-@@ -62,6 +62,8 @@ CLEANFILES = $(nodist_prog_SOURCES)
- END
- 
- cat > main.c << 'END'
-+extern int yylex (void);
-+
- int main ()
- {
-   return yylex ();
-diff --git a/t/ltcond2.sh b/t/ltcond2.sh
-index 29244c9b3..7e7bcadc4 100644
--- a/t/ltcond2.sh
-+++ b/t/ltcond2.sh
-@@ -73,6 +73,8 @@ void print (void)
- END
- 
- cat > main.c <<'END'
-+extern void print(void);
-+
- int main (void)
- {
-   print();
-diff --git a/t/ltconv.sh b/t/ltconv.sh
-index 2c4cc47a1..ec79ef80e 100644
--- a/t/ltconv.sh
-+++ b/t/ltconv.sh
-@@ -91,6 +91,12 @@ echo 'int sub22 () { return 22; }' > sub2/sub22/sub22.c
- 
- cat >test.c <<'EOF'
- #include <stdio.h>
-+
-+extern int sub1 (void);
-+extern int sub2 (void);
-+extern int sub21 (void);
-+extern int sub22 (void);
-+
- int main ()
- {
-   if (1 != sub1 ())
-diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
-index bb656c43f..53fc02f09 100644
--- a/t/subobj-clean-lt-pr10697.sh
-+++ b/t/subobj-clean-lt-pr10697.sh
-@@ -83,7 +83,15 @@ libfoo_la_SOURCES = \
- END
- 
- mkdir sub1 sub2
-echo 'int libmain (void)' > main.c
-+
-+echo "/* Subobj clean: libtool case*/" > main.c
-+for i in 1 2; do
-+  for j in a b c d e f; do
-+    echo "extern void $j$i (void);" >> main.c
-+  done
-+done
-+
-+echo 'int libmain (void)' >> main.c
- echo '{' >> main.c
- for i in 1 2; do
-   for j in a b c d e f; do
-diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
-index f77de8c92..a7f97f6d1 100644
--- a/t/subobj-clean-pr10697.sh
-+++ b/t/subobj-clean-pr10697.sh
-@@ -81,7 +81,15 @@ foo_SOURCES = \
- END
- 
- mkdir sub1 sub2
-echo 'int main (void)' > main.c
-+
-+echo "/* Subobj clean: generic case*/" > main.c
-+for i in 1 2; do
-+  for j in a b c d e f; do
-+    echo "extern void $j$i (void);" >> main.c
-+  done
-+done
-+
-+echo 'int main (void)' >> main.c
- echo '{' >> main.c
- for i in 1 2; do
-   for j in a b c d e f; do
-diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh
-index b9c022f70..1a9e1e026 100644
--- a/t/tags-pr12372.sh
-+++ b/t/tags-pr12372.sh
-@@ -53,7 +53,8 @@ noinst_PROGRAMS = zap
- zap_SOURCES = zardoz.pc
- END
- 
-echo 'int main(void) [ return bar(1); ]' > foo-main.pc
-+echo 'extern int bar(int);' > foo-main.pc
-+echo 'int main(void) [ return bar(1); ]' >> foo-main.pc
- echo 'int bar(int x) { return !x; }' > barbar.c
- echo 'int m@in(void) { return 0; }' > sub/zardoz.pc
- 
-diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
-index 5b258a30c..8cc0d06a2 100644
--- a/t/yacc-basic.sh
-+++ b/t/yacc-basic.sh
-@@ -49,6 +49,7 @@ a : 'a' { exit(0); };
- END
- 
- cat > foo.c << 'END'
-+extern int yyparse(void);
- int main () { yyparse (); return 1; }
- END
- 
-diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
-index 373774b6a..fef079cf3 100644
--- a/t/yacc-clean.sh
-+++ b/t/yacc-clean.sh
-@@ -65,6 +65,8 @@ END
- 
- cat > sub1/parse.y << 'END'
- %{
-+#include <stdio.h>
-+
- int yylex () { return (getchar ()); }
- void yyerror (const char *s) {}
- %}
-@@ -74,6 +76,8 @@ END
- cp sub1/parse.y sub2/parse.y
- 
- cat > sub1/main.c << 'END'
-+extern int yyparse(void);
-+
- int main ()
- {
-   return yyparse ();
-diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
-index d350a80f9..4a8ebe9ca 100644
--- a/t/yacc-nodist.sh
-+++ b/t/yacc-nodist.sh
-@@ -78,6 +78,8 @@ BUILT_SOURCES = parse.h
- END
- 
- cat > sub1/main.c << 'END'
-+extern int yyparse(void);
-+
- int main ()
- {
-   return yyparse ();
-- 
-2.38.1
-
--- a/v3-0003-tests-Fix-implicit-function-declaration-in-ax-dep.patch
+++ b/v3-0003-tests-Fix-implicit-function-declaration-in-ax-dep.patch
@ -1,58 +0,0 @@
-From 5e74354030fe88e038a6fc1b3f4c2321df150352 Mon Sep 17 00:00:00 2001
-From: Frederic Berat <fberat@redhat.com>
-Date: Fri, 16 Dec 2022 06:42:45 +0100
-Subject: [PATCH v3] tests: Fix implicit function declaration in ax/depcomp.sh
-In-Reply-To: <20230113064804.580F5340B54@smtp.gentoo.org>
-
-Change since v2:
- - Replace the mv operation by a cp operation to ensure that subfoo.h is
-   considered being modified.
-
-- 8< --
-
-In depcomp.sh, the following occurs:
-
-1. Files are created so that headers and units are available in
-   subdirectories
-2. Multiple "make" are executed, while modifying the content of the
-   headers, some should fail, others should succeed.
-3. At the end, the "sub/subfoo.h" header gets removed.
-4. make is executed again, which is expected to succeed.
-
-Yet, with c99, this can't work as the subfoo.h header contains
-declaration that are used by foo.c.
-Thus, we need to get them back, either by inserting the declaration in
-foo.c (or any other header/unit), or by restoring subfoo.h to its
-original state.
-
-The later solution seems the easiest path, being less intrusive in
-depcomp.sh.
---
- t/ax/depcomp.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh
-index 7a3ac63a7..c92f7c8df 100644
--- a/t/ax/depcomp.sh
-+++ b/t/ax/depcomp.sh
-@@ -243,6 +243,7 @@ cat > sub/subfoo.h <<'END'
- #include <stdio.h>
- extern int subfoo (void);
- END
-+cp sub/subfoo.h sub/subfoo.save
- 
- cat > src/baz.c <<'END'
- #include "baz.h"
-@@ -399,8 +400,7 @@ do_test ()
-       && rewrite "$srcdir"/sub/subfoo.h echo 'choke me' \
-       && not $MAKE \
-       && delete "$srcdir"/sub/subfoo.h \
-      && edit "$srcdir"/sub/subfoo.c -e 1d \
-      && edit "$srcdir"/foo.h -e 2d \
-+      && cp "$srcdir"/sub/subfoo.save "$srcdir"/sub/subfoo.h \
-       && make_ok \
-       || r='not ok'
-     result_ "$r" "$pfx dependency tracking works"
-- 
-2.39.0
-
				`@ -0,0 +1 @@`
				`1012bc79956013d53da0890f8493388a6cb20831 SOURCES/automake-1.16.1.tar.xz`
				`@ -1 +0,0 @@`
				`SHA512 (automake-1.16.5.tar.xz) = 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88`