From 3ddaf2cb1d21dbc1a558064be01f5f89693d7222 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 07 2021 17:02:02 +0000 Subject: import python-rpm-macros-3.9-43.el9 --- diff --git a/SOURCES/macros.python-srpm b/SOURCES/macros.python-srpm index f6f1db6..8401975 100644 --- a/SOURCES/macros.python-srpm +++ b/SOURCES/macros.python-srpm @@ -49,6 +49,20 @@ # Alternatively, it can be overridden in spec (e.g. to "3.8") when building for alternate Python stacks. %python3_pkgversion 3 +# 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 + # === Macros for Build/Requires tags using Python dist tags === # - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages # - These macros need to be in macros.python-srpm, because BuildRequires tags diff --git a/SPECS/python-rpm-macros.spec b/SPECS/python-rpm-macros.spec index bf7be70..4290cf0 100644 --- a/SPECS/python-rpm-macros.spec +++ b/SPECS/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3.9 -Release: 42%{?dist} +Release: 43%{?dist} Summary: The common Python RPM macros URL: https://src.fedoraproject.org/rpms/python-rpm-macros/ @@ -96,6 +96,10 @@ install -m 644 compileall2.py %{buildroot}%{_rpmconfigdir}/redhat/ %changelog +* Wed Aug 11 2021 Tomas Orsava - 3.9-43 +- Define a new macros %%python_wheel_dir and %%python_wheel_pkg_prefix +- Related: rhbz#1982668 + * Tue Aug 10 2021 Mohan Boddu - 3.9-42 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688