From add3da24f037a9d934eaeb9a6c246a45d3a716cc Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: May 22 2024 09:26:11 +0000
Subject: 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.

---

diff --git a/glibc.spec b/glibc.spec
index 5b0aabd..23153b5 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -170,7 +170,7 @@ Version: %{glibcversion}
 # - It allows using the Release number without the %%dist tag in the dependency
 #   generator to make the generated requires interchangeable between Rawhide
 #   and ELN (.elnYY < .fcXX).
-%global baserelease 22
+%global baserelease 23
 Release: %{baserelease}%{?dist}
 
 # Licenses:
@@ -361,8 +361,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
@@ -2559,6 +2559,9 @@ update_gconv_modules_cache ()
 %endif
 
 %changelog
+* Wed May 22 2024 Florian Weimer <fweimer@redhat.com> - 2.39.9000-23
+- Use release instead of baserelease for glibc32 conflict
+
 * Sun May 19 2024 Florian Weimer <fweimer@redhat.com> - 2.39.9000-22
 - Add Conflicts:/Obsoletes: for glibc32 to glibc.i686