Add Conflicts:/Obsoletes: for glibc32 to glibc.i686

(cherry picked from commit cb26947f73950b581adfac51cd51f8481cc95a94)
This commit is contained in:
Florian Weimer 2024-05-31 17:22:39 +02:00
parent 4d899fdb65
commit 9dd8b289e9

View File

@ -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 18
%global baserelease 19
Release: %{baserelease}%{?dist}
# Licenses:
@ -437,6 +437,10 @@ Requires: basesystem
# after nss_*.x86_64. (See below for the other ordering.)
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}
%endif
# This is for building auxiliary programs like memusage
@ -2632,6 +2636,9 @@ update_gconv_modules_cache ()
%endif
%changelog
* Fri Jul 19 2024 Florian Weimer <fweimer@redhat.com> - 2.39-19
- Add Conflicts:/Obsoletes: for glibc32 to glibc.i686
* Thu Jul 18 2024 Arjun Shankar <arjun@redhat.com> - 2.39-18
- ppc64le: Build early startup code with -mcpu=power8