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.

Resolves: rhbz#2210304
This commit is contained in:
Frédéric Bérat 2023-06-21 17:58:02 +02:00
parent 944ea48ddd
commit fc11c2203c
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,35 @@
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.
---
NEWS | 3 +++
m4/python.m4 | 1 +
2 files changed, 4 insertions(+)
diff --git a/m4/python.m4 b/m4/python.m4
index f5b5371c6..6653e4d89 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.40.1

View File

@ -15,7 +15,7 @@ Summary: A GNU tool for automatically creating Makefiles
Name: automake Name: automake
# Any bump here requires libtool rebuild, rhbz#1813010 # Any bump here requires libtool rebuild, rhbz#1813010
Version: %{api_version}.2 Version: %{api_version}.2
Release: 7%{?dist} Release: 8%{?dist}
# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
License: GPLv2+ and GFDL and Public Domain and MIT License: GPLv2+ and GFDL and Public Domain and MIT
@ -40,6 +40,13 @@ Patch1: automake-1.16.2-python-version-multiple-digits.patch
# Fixes: RHBZ#2215991 # Fixes: RHBZ#2215991
Patch2: 0001-tests-use-testsuite-directory-in-DejaGnu-tests.patch Patch2: 0001-tests-use-testsuite-directory-in-DejaGnu-tests.patch
# Backport 930a9a73f4bb776ec334eff4cf6e182802841daa
# Stripped from NEWS updates.
# Ensures python 3.1x can be found even if it is not the default system
# interpreter.
# See RHBZ#2210304
Patch3: 0001-python-add-3.10-3.15-to-the-version-search-list.patch
URL: http://www.gnu.org/software/automake/ URL: http://www.gnu.org/software/automake/
Requires: autoconf >= 2.65 Requires: autoconf >= 2.65
@ -148,6 +155,10 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
%changelog %changelog
* Fri Jun 23 2023 Frederic Berat <fberat@redhat.com> - 1.16.2-8
- Backport python: add 3.10 - 3.15 to the version search list
- Fixes: RHBZ#2210304
* Wed Jun 21 2023 Frederic Berat <fberat@redhat.com> - 1.16.2-7 * Wed Jun 21 2023 Frederic Berat <fberat@redhat.com> - 1.16.2-7
- Backport: tests: use testsuite/ directory in DejaGnu tests - Backport: tests: use testsuite/ directory in DejaGnu tests
- Fixes: RHBZ#2215991 - Fixes: RHBZ#2215991