diff --git a/binutils.spec b/binutils.spec index 2191ec5..90b7d36 100644 --- a/binutils.spec +++ b/binutils.spec @@ -21,7 +21,7 @@ Name: %{?scl_prefix}binutils # The variable %%{source} (see below) should be set to indicate which of these # origins is being used. Version: 2.46 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later URL: https://sourceware.org/binutils @@ -387,10 +387,8 @@ BuildRequires: bison %if %have_scl_utils BuildRequires: scl-utils-build %else -%if ! %{bootstrapping} BuildRequires: gcc-toolset-%{gts_ver}-devel %endif -%endif %if %{with clang} @@ -521,7 +519,7 @@ Requires: (%{?scl_prefix}runtime >= %{gts_ver} with %{?scl_prefix}runtime < %{g %endif %if %{bootstrapping} -%define alternatives_cmd /usr/bin/alternatives +%define alternatives_cmd /usr/sbin/alternatives %define alternatives_cmdline %{alternatives_cmd} %else %define alternatives_cmd %{!?scl:%{_sbindir}}%{?scl:%{_root_sbindir}}/alternatives @@ -1389,10 +1387,8 @@ done export QA_RPATHS=0x0003 %if %have_scl_utils == 0 -%if ! %{bootstrapping} mkdir -p %{buildroot}%{_scl_root}/etc/alternatives %{buildroot}%{_scl_root}/var/lib/alternatives %endif -%endif #---------------------------------------------------------------------------- @@ -1556,11 +1552,9 @@ exit 0 %endif %if %have_scl_utils == 0 -%if ! %{bootstrapping} %dir %{_scl_root}/etc/alternatives %dir %{_scl_root}/var/lib/alternatives %endif -%endif #------------------------------------ @@ -1595,11 +1589,7 @@ exit 0 %{_bindir}/gprofng-* %dir %{_libdir}/gprofng %{_libdir}/gprofng/* -%if %{bootstrapping} -/etc/gprofng.rc -%else %{_scl_root}/etc/gprofng.rc -%endif %if %{enable_shared} %{_libdir}/libgprofng.* @@ -1646,6 +1636,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon Jul 06 2026 Siddhesh Poyarekar - 2.46-2 +- Fix alternatives path when bootstrapping (RHEL-191862) + * Mon Jun 08 2026 Nick Clifton - 2.46-1 - Initial commit on c10s. (RHELMISC-34705) - Resolves: RHELMISC-34705