From e46ca7276799a4feb592d574edfadadd659bcdf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 2 Mar 2022 00:00:43 +0100 Subject: [PATCH] Include the Python version in Release to workaround debuginfo conflicts and make pypy versions with otherwise the same version-release always sorted by Python version as well. This potentially allows tags like Obsoletes: pypy3 < %{version}-%{release}. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2053880 --- pypy3.9.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pypy3.9.spec b/pypy3.9.spec index 2fa86bf..e6c3622 100644 --- a/pypy3.9.spec +++ b/pypy3.9.spec @@ -5,7 +5,12 @@ Name: pypy%{pyversion} Version: %{basever}.%{micro}%{?pre:~%{pre}} %global version_ %{basever}.%{micro}%{?pre} -Release: 1%{?dist} +# The Python version is included in Release to workaround debuginfo conflicts +# and make pypy versions with otherwise the same version-release always sorted +# by Python version as well. +# This potentially allows tags like Obsoletes: pypy3 < %%{version}-%%{release}. +# https://bugzilla.redhat.com/2053880 +Release: 1.%{pyversion}%{?dist} Summary: Python %{pyversion} implementation with a Just-In-Time compiler # PyPy is MIT @@ -805,6 +810,11 @@ CheckPyPy pypy%{pyversion}-c %changelog +* Tue Mar 01 2022 Miro Hrončok - 7.3.8-1.3.9 +- Include the Python version in Release to workaround debuginfo conflicts + and make same builds of different PyPy sort in a predictable way (e.g. wrt Obsoletes) +- Fixes: rhbz#2053880 + * Tue Feb 22 2022 Miro Hrončok - 7.3.8-1 - Update to 7.3.8 final