From 202dc5874dfd3ef8c5f3644ce74cb9465e0a0f2c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 09:26:27 +0000 Subject: [PATCH] import python-rpm-macros-3-44.el8 --- SOURCES/macros.python-srpm | 13 +++++++++++++ SPECS/python-rpm-macros.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/SOURCES/macros.python-srpm b/SOURCES/macros.python-srpm index bdd13cb..f727c80 100644 --- a/SOURCES/macros.python-srpm +++ b/SOURCES/macros.python-srpm @@ -7,6 +7,19 @@ %py3_other_build /bin/true %py3_other_install /bin/true +# 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 === diff --git a/SPECS/python-rpm-macros.spec b/SPECS/python-rpm-macros.spec index f36d9b2..a8cc7c1 100644 --- a/SPECS/python-rpm-macros.spec +++ b/SPECS/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 43%{?dist} +Release: 44%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -75,6 +75,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %changelog +* Fri Oct 14 2022 Charalampos Stratakis - 3-44 +- Backport the %%python_wheel_pkg_prefix and the %%python_wheel_dir macros from Fedora +Resolves: rhbz#2143991 + * Tue Jul 26 2022 Tomas Orsava - 3-43 - Make %%pytest macro respect %%python3_pkgversion Resolves: rhbz#2091462