From 8efe2c0ca6fa82605beb21fefed6c818b5d48fa0 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 24 Jun 2025 15:10:06 +0100
Subject: [PATCH] Use the new gcc-toolset-15-runtime package.  Disable
 bootstrapping but also disable annobin. Resolves: RHEL-94763

---
 binutils.spec | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/binutils.spec b/binutils.spec
index 8847254..93b5494 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -5,8 +5,11 @@
 %endif
 
 %global gts_ver 15
+%global gts_next  %(v="%{gts_ver}"; echo $((++v)))
+
 %{?scl_package:%global scl gcc-toolset-%{gts_ver}}
 %global scl_prefix gcc-toolset-%{gts_ver}-
+
 %if %have_scl_utils
 BuildRequires: scl-utils-build
 %else
@@ -24,7 +27,7 @@ Name: %{?scl_prefix}binutils
 # The variable %%{source} (see below) should be set to indicate which of these
 # origins is being used.
 Version: 2.44
-Release: 3%{?dist}
+Release: 4%{?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
 
@@ -148,7 +151,7 @@ URL: https://sourceware.org/binutils
 # Bootstrapping: Set this to 1 to build the binutils with the system gcc.
 # Then once GTS-gcc is built and in the buildroot, reset this variable
 # to 0, bump the NVR and rebuild GTS-binutils.
-%define bootstrapping 1
+%define bootstrapping 0
 
 #----End of Configure Options------------------------------------------------
 
@@ -383,13 +386,15 @@ BuildRequires: clang compiler-rt
 %define gcc_package %{?scl_prefix}gcc
 %define gxx_package %{?scl_prefix}gcc-c++
 
-%if 0%{rhel} < 9
-BuildRequires: %{?scl_prefix}annobin-plugin-gcc
-%endif
-
 %define gcc_for_binutils %{_scl_root}/usr/bin/gcc
 %define gxx_for_binutils %{_scl_root}/usr/bin/g++
 
+%if 0%{rhel} < 9
+BuildRequires: %{?scl_prefix}annobin-plugin-gcc
+%else
+BuildRequires: %{?scl_prefix}gcc-plugin-annobin
+%endif
+
 %endif
 
 BuildRequires: %{gcc_package}
@@ -472,7 +477,10 @@ BuildRequires: xxhash-devel
 
 %if %have_scl_utils
 %{?scl:Requires:%scl_runtime}
+%else
+Requires:  (%{?scl_prefix}runtime >= %{gts_ver} with %{?scl_prefix}runtime < %{gts_next})
 %endif
+
 %define alternatives_cmd     %{!?scl:%{_sbindir}}%{?scl:%{_root_sbindir}}/alternatives
 %define alternatives_cmdline %{alternatives_cmd}%{?scl: --altdir %{_sysconfdir}/alternatives --admindir %{_scl_root}/var/lib/alternatives}
 
@@ -1568,6 +1576,10 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Tue Jun 24 2025 Nick Clifton  <nickc@redhat.com> - 2.44-4
+- Use the new gcc-toolset-15-runtime package.  (RHEL-94763)
+- Disable bootstrapping but also disable annobin.
+
 * Mon May 12 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.44-3
 - Avoid using SCL for c10s.