From fe7e34ff91545bdf82b634ca11cf47dcd2624e15 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sat, 16 Jul 2022 05:01:59 -0500 Subject: [PATCH] Remove %__pythondist_provides from pythondist.attr. %__python_provides in RHEL's python3-rpm-generators does the same thing, so this wastes time by running it twice. Additionally, our version is out of date and packages built against alternative python stacks incorrectly have python3dist(X) Provides. Related: https://bugzilla.redhat.com/1776941 Related: https://git.centos.org/rpms/python-rpm-generators/c/d809defd2ccab8945493103694fe96ffe6ea3a3c?branch=c8s --- epel-rpm-macros.spec | 6 +++++- pythondist.attr | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index d20e4ef..24f16fd 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -113,7 +113,11 @@ install -Dpm 644 %{SOURCE150} \ %changelog * Sat Jul 16 2022 Maxwell G - 8-32 -- Explicitly Require python3-rpm-generators +- Explicitly Require python3-rpm-generators +- Remove %__pythondist_provides from pythondist.attr. +- Ensure that packages built against alternative python stacks do not have + python3dist(x) Provides. +- Related: rhbz#1776941. * Sat Jul 16 2022 Miro Hrončok - 8-31 - Fix a regression in the %%pytest definition (/usr/bin/pytest: No such file or directory) diff --git a/pythondist.attr b/pythondist.attr index 2bf737a..d34affd 100644 --- a/pythondist.attr +++ b/pythondist.attr @@ -1,3 +1,2 @@ -%__pythondist_provides %{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides %__pythondist_requires %{_rpmconfigdir}/pythondistdeps.py --requires %__pythondist_path ^/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$