diff --git a/glibc.spec b/glibc.spec index 56e7925..990213c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -171,7 +171,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 5 +%global baserelease 6 Release: %{baserelease}%{?dist} # Licenses: @@ -1094,6 +1094,11 @@ that can be installed across architectures. %package -n glibc32 Summary: The GNU libc libraries (32-bit) Conflicts: glibc(x86-32) +%dnl The gcc package does not use ELF dependencies to install glibc32: +%dnl BuildRequires: (glibc32 or glibc-devel(%{__isa_name}-32)) +%dnl Not generating the ELF dependencies for glibc32 makes it less likely +%dnl that the package is selected by accident over glibc.i686. +AutoReqProv: no %description -n glibc32 This package is only used for internal building of multilib aware @@ -2459,6 +2464,9 @@ update_gconv_modules_cache () %endif %changelog +* Tue Mar 26 2024 Florian Weimer - 2.39-6 +- Do not generate ELF dependency information for glibc32 + * Tue Mar 26 2024 Joseph Myers - 2.39-5 - Build glibc32 binary package from glibc sources as part of x86_64 build, not from glibc32 SRPM that contains binaries from i686 RPM build.