From 34a7a95ddbf21262840c00d68e7abc76a687e7ae Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 23 May 2023 12:15:27 +0100 Subject: [PATCH] Spec File: Use the correct alternatives. Resolves: #2209151 --- binutils.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/binutils.spec b/binutils.spec index 8d328ca..4c5df58 100644 --- a/binutils.spec +++ b/binutils.spec @@ -9,7 +9,7 @@ BuildRequires: scl-utils-build Summary: A GNU collection of binary utilities Name: %{?scl_prefix}binutils Version: 2.40 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -344,8 +344,8 @@ BuildRequires: dejagnu, zlib-static, glibc-static, sharutils, bc, libstdc++ BuildRequires: elfutils-debuginfod-client-devel %endif -Requires(post): %{_sbindir}/alternatives -Requires(preun): %{_sbindir}/alternatives +Requires(post): alternatives +Requires(preun): alternatives # We also need rm. Requires(post): coreutils @@ -1104,11 +1104,11 @@ export QA_RPATHS=0x0003 %post %__rm -f %{_bindir}/ld -%{_sbindir}/alternatives --install %{_bindir}/ld ld \ +%{_root_sbindir}/alternatives --install %{_bindir}/ld ld \ %{_bindir}/ld.bfd %{ld_bfd_priority} %if %{with gold} -%{_sbindir}/alternatives --install %{_bindir}/ld ld \ +%{_root_sbindir}/alternatives --install %{_bindir}/ld ld \ %{_bindir}/ld.gold %{ld_gold_priority} %endif @@ -1123,11 +1123,11 @@ exit 0 %preun if [ $1 = 0 ]; then - %{_sbindir}/alternatives --remove ld %{_bindir}/ld.bfd + %{_root_sbindir}/alternatives --remove ld %{_bindir}/ld.bfd fi %if %{with gold} if [ $1 = 0 ]; then - %{_sbindir}/alternatives --remove ld %{_bindir}/ld.gold + %{_root_sbindir}/alternatives --remove ld %{_bindir}/ld.gold fi %endif @@ -1262,6 +1262,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon May 22 2023 Marek Polacek - 2.40-9 +- Spec File: Use the correct alternatives. (#2209151) + * Tue Apr 25 2023 Nick Clifton - 2.40-8 - Suppress some s390x linker tests. (#2186396)