diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index f7cb5b3..fdf354a 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 8 -Release: 24 +Release: 25 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -72,6 +72,9 @@ install -Dpm 644 %{SOURCE150} \ %changelog +* Tue Oct 26 2021 Tomas Orsava - 8-25 +- Define a new macros %%python_wheel_dir and %%python_wheel_pkg_prefix + * Wed Sep 1 2021 Michel Alexandre Salim - 8-24 - Fix macros.build-constraints' %%limit_build - number of CPUs will never be set to less than 1 diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index c693891..6c08775 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -115,6 +115,20 @@ %undefine __pythondist_requires \ %{nil} +# Define where Python wheels will be stored and the prefix of -wheel packages +# - In Fedora we want wheel subpackages named e.g. `python-pip-wheel` that +# install packages into `/usr/share/python-wheels`. Both names are not +# versioned, because they're used by all Python 3 stacks. +# - In RHEL we want wheel packages named e.g. `python3-pip-wheel` and +# `python3.11-pip-wheel` that install packages into similarly versioned +# locations. We want each Python stack in RHEL to have their own wheels, +# because the main python3 wheels (which we can't upgrade) will likely be +# quite old by the time we're adding new alternate Python stacks. +# - In ELN we want to follow Fedora, because builds for ELN and Fedora rawhide +# need to be interoperable. +%python_wheel_pkg_prefix python%{?rhel:%{!?eln:%{python3_pkgversion}}} +%python_wheel_dir %{_datadir}/%{python_wheel_pkg_prefix}-wheels + # gpgverify verifies signed sources. There is documentation in the script. %gpgverify(k:s:d:) %{lua: local script = rpm.expand("%{_rpmconfigdir}/gpgverify ")