From 73454ac54c61beebb1a7dc648e413362ddee5c1d Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 18 Jul 2022 22:25:45 -0500 Subject: [PATCH] Add explanatory comment and escape changelog macro --- epel-rpm-macros.spec | 2 +- macros.epel-rpm-macros | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 24f16fd..84d45ad 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -114,7 +114,7 @@ install -Dpm 644 %{SOURCE150} \ %changelog * Sat Jul 16 2022 Maxwell G - 8-32 - Explicitly Require python3-rpm-generators -- Remove %__pythondist_provides from pythondist.attr. +- Remove %%__pythondist_provides from pythondist.attr. - Ensure that packages built against alternative python stacks do not have python3dist(x) Provides. - Related: rhbz#1776941. diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index ff2f70b..595fa57 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -84,6 +84,12 @@ ) } +# When packagers go against the Packaging Guidelines and disable the runtime +# dependency generator, we want it to fall back to only creating the python(abi) +# Requires instead of none at all. +# +# This macro is EPEL 8 only, as the pythondist dependency generator +# is already disabled by the default in RHEL. %python_disable_dependency_generator() \ %undefine __pythondist_requires \ %{nil}