From 99e7d8694cbcfeb9bd4336de232677533a16e9a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 31 Jan 2022 12:05:30 +0100 Subject: [PATCH] Explicitly opt-out from Python name-based provides and obsoletes generators In Koji, python3-rpm-generators are not installed during the build. However, packagers can have them installed locally, in mock or in Copr. This way, we make sure the automatic provides (and obsoletes) do not magically appear only in some environments. Since python3-rpm-macros actually requires python-rpm-macros, the requirement is self-satisfied when the automatic provides are generated. --- python-rpm-macros.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 76d264d..cd4d6af 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -49,7 +49,7 @@ elseif posix.stat('macros.python-srpm') then end } Version: %{__default_python3_version} -Release: 15%{?dist} +Release: 16%{?dist} BuildArch: noarch @@ -58,6 +58,12 @@ BuildArch: noarch # For compileall2.py Requires: python-srpm-macros = %{version}-%{release} +# The packages are called python(3)-(s)rpm-macros +# We never want python3-rpm-macros to provide python-rpm-macros +# We opt out from all Python name-based automatic provides and obsoletes +%undefine __pythonname_provides +%undefine __pythonname_obsoletes + %description This package contains the unversioned Python RPM macros, that most implementations should rely on. @@ -145,6 +151,9 @@ install -m 755 brp-* %{buildroot}%{_rpmconfigdir}/redhat/ %changelog +* Mon Jan 31 2022 Miro Hrončok - 3.10-16 +- Explicitly opt-out from Python name-based provides and obsoletes generators + * Tue Dec 21 2021 Tomas Orsava - 3.10-15 - Add lua helper functions to make it possible to automatically generate Obsoletes tags