diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index ac9a756..ff2f70b 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -16,6 +16,7 @@ # This macro is copied here from https://git.centos.org/rpms/python-rpm-macros/pull-request/1 # and is needed for the overrides in macros.zzz-epel-override. # It will be removed once it lands in RHEL. +# https://bugzilla.redhat.com/show_bug.cgi?id=2090007 # # RHEL 9+ and Fedora compatibility macro # Only use in macro backports, not intended to be used in spec files! diff --git a/macros.zzz-epel-override b/macros.zzz-epel-override index 2e089ee..5c11cc8 100644 --- a/macros.zzz-epel-override +++ b/macros.zzz-epel-override @@ -4,15 +4,22 @@ # Override %__python3 here based on %%python3_pkgversion to avoid relying on the finicky # python3X-rpm-macros packages. # Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/a8b26546eb699afe0dbfcef913a2aa7085fc5afb?branch=rawhide +# +# EPEL specific, RHEL defines this in the python3X-rpm-macros packages +# and the default is /usr/libexec/platform-python. +# Usually, we don't want EPEL packages to use platform-python. +# Packages that want to do that can explicitly override this. %__python3 /usr/bin/python%{_python3_pkgversion_with_dot} # RHEL 8's %%pytest does not work properly on non-default Python versions. # Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/02536540768555dde6d675935db45df81bcab7bf?branch=rawhide +# https://bugzilla.redhat.com/show_bug.cgi?id=2091462 %__pytest /usr/bin/pytest%(test %{python3_pkgversion} == 3 || echo -%{python3_version}) # RHEL 8's %%py3_dist does not work properly on non-default Python versions. # This is copied here from https://git.centos.org/rpms/python-rpm-macros/pull-request/1 # until that lands in RHEL. +# https://bugzilla.redhat.com/show_bug.cgi?id=2090007 # Creates Python 3 dist tag(s) after converting names to canonical format # Needs to first put all arguments into a list, because invoking a different