From 0b92ae19ae64f21d96d45f0b9f0d535093e1c471 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 22 May 2024 11:26:11 +0200 Subject: [PATCH] Use release instead of baserelease for glibc32 conflict This is necessary because %{baserelease} < %{release}, so the previous Obsoletes: clause did not match an installed glibc32 package from the same build. (cherry picked from commit add3da24f037a9d934eaeb9a6c246a45d3a716cc) --- glibc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glibc.spec b/glibc.spec index 0b9005a..79de104 100644 --- a/glibc.spec +++ b/glibc.spec @@ -439,8 +439,8 @@ Recommends: (nss_db(x86-32) if nss_db(x86-64)) Recommends: (nss_hesiod(x86-32) if nss_hesiod(x86-64)) # Deinstall the glibc32 package if present. This helps tests that do # not run against the compose. -Conflicts: glibc32 <= %{version}-%{baserelease} -Obsoletes: glibc32 <= %{version}-%{baserelease} +Conflicts: glibc32 <= %{version}-%{release} +Obsoletes: glibc32 <= %{version}-%{release} %endif # This is for building auxiliary programs like memusage