From a55b0269f04340a3705c19d0925b8062d982c6c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
Date: Tue, 19 Nov 2024 09:09:11 +0100
Subject: [PATCH] Fix pep3147_tweak regression

Backport ab347652df9ff8f65ba1be6aaa357cf3c2b16dca which ensures that the
am__pep3147_tweak is properly defined in all cases.

Resloves: RHEL-59974
---
 ...t-noinst_PYTHON-preceding-foo_PYTHON.patch | 58 +++++++++++++++++++
 automake.spec                                 |  4 ++
 2 files changed, 62 insertions(+)
 create mode 100644 0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch

diff --git a/0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch b/0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch
new file mode 100644
index 0000000..5d60b9a
--- /dev/null
+++ b/0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch
@@ -0,0 +1,58 @@
+From ab347652df9ff8f65ba1be6aaa357cf3c2b16dca Mon Sep 17 00:00:00 2001
+From: Bogdan <bogdro_rep@gmx.us>
+Date: Wed, 5 Jul 2023 08:59:29 -0700
+Subject: [PATCH] python: support noinst_PYTHON preceding foo_PYTHON.
+
+This change fixes https://bugs.gnu.org/24507.
+
+* lib/am/python.am (am__pep3147_tweak): remove conditional
+on %?INSTALL%.
+* t/python-pr10995.sh: test with make uninstall.
+---
+ lib/am/python.am    | 4 ++--
+ t/python-pr10995.sh | 6 ++++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/lib/am/python.am b/lib/am/python.am
+index 98f95af1b..19f268efc 100644
+--- a/lib/am/python.am
++++ b/lib/am/python.am
+@@ -94,11 +94,11 @@ endif %?INSTALL%
+ ## Uninstalling.  ##
+ ## -------------- ##
+ 
+-if %?INSTALL%
+-
+ ?FIRST?am__pep3147_tweak = \
+ ?FIRST?  sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|'
+ 
++if %?INSTALL%
++
+ .PHONY uninstall-am: uninstall-%DIR%PYTHON
+ uninstall-%DIR%PYTHON:
+ 	@$(NORMAL_UNINSTALL)
+diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
+index 324be916e..abeb8a124 100644
+--- a/t/python-pr10995.sh
++++ b/t/python-pr10995.sh
+@@ -17,6 +17,9 @@
+ # Test automake bug#10995: am__py_compile doesn't get correctly defined
+ # when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON'
+ # declaration.
++# Test also automake bug#24507: am__pep3147_tweak doesn't get correctly
++# defined when there a 'noinst_PYTHON' declaration precedes a 'foo_PYTHON'
++# declaration and 'make uninstall' fails functionally (just shows errors).
+ 
+ required=python
+ . test-init.sh
+@@ -53,4 +56,7 @@ py_installed --not inst/py/no.pyc
+ 
+ $MAKE disttest
+ 
++LC_ALL=C run_make -M uninstall
++grep 'command substitution' output && exit 1
++
+ :
+-- 
+2.47.0
+
diff --git a/automake.spec b/automake.spec
index 28b2a2d..d4b3dab 100644
--- a/automake.spec
+++ b/automake.spec
@@ -75,6 +75,9 @@ Patch5: v2-0001-tests-Don-t-try-to-prevent-flex-to-include-unistd.patch
 # 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
 
+# From upstream: ab347652df9ff8f65ba1be6aaa357cf3c2b16dca
+Patch7: 0001-python-support-noinst_PYTHON-preceding-foo_PYTHON.patch
+
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
 
@@ -179,6 +182,7 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \
 %changelog
 * Tue Nov 26 2024 Frederic Berat <fberat@redhat.com> - 1.16.5-19
 - Filter ncompress out for rhel (RHEL-66594)
+- Fix pep3147_tweak regression (RHEL-59974)
 
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.16.5-18
 - Bump release for October 2024 mass rebuild: