rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use release instead of baserelease for glibc32 conflict

Browse Source 
This is necessary because %{baserelease} < %{release}, so the
previous Obsoletes: clause did not match an installed glibc32
package from the same build.
This commit is contained in:
Florian Weimer 2024-05-22 11:26:11 +02:00
parent cb26947f73
commit add3da24f0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glibc.spec
View File

@ -170,7 +170,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency # - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide # generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX). # and ELN (.elnYY < .fcXX).
%global baserelease 22 %global baserelease 23
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
# Licenses: # 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)) Recommends: (nss_hesiod(x86-32) if nss_hesiod(x86-64))
# Deinstall the glibc32 package if present. This helps tests that do # Deinstall the glibc32 package if present. This helps tests that do
# not run against the compose. # not run against the compose.
Conflicts: glibc32 <= %{version}-%{baserelease} Conflicts: glibc32 <= %{version}-%{release}
Obsoletes: glibc32 <= %{version}-%{baserelease} Obsoletes: glibc32 <= %{version}-%{release}
%endif %endif
# This is for building auxiliary programs like memusage # This is for building auxiliary programs like memusage
@ -2559,6 +2559,9 @@ update_gconv_modules_cache ()
%endif %endif
%changelog %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 * Sun May 19 2024 Florian Weimer <fweimer@redhat.com> - 2.39.9000-22
- Add Conflicts:/Obsoletes: for glibc32 to glibc.i686 - Add Conflicts:/Obsoletes: for glibc32 to glibc.i686