From aba667e6eb7a42b4352d3a0c39d07aae2bbc7e9b Mon Sep 17 00:00:00 2001 From: eastb233 Date: Tue, 29 Aug 2023 10:59:32 +0800 Subject: [PATCH] [SPEC] Rename ctf-spec.info in binutils package Because gdb-help package also provides it. (cherry picked from commit 0a7ad38dbb0a69383c553c9823bb9acd90ad2151) --- binutils.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/binutils.spec b/binutils.spec index b665fac..0b66237 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?_with_debug:-debug} Version: 2.40 -Release: 2 +Release: 3 License: GPL-3.0-or-later URL: https://sourceware.org/binutils @@ -1111,6 +1111,11 @@ EOF cat gold.lang >> binutils.lang fi + if [ -f $local_infodir/ctf-spec.info ]; then + # Rename ctf-spec.info because gdb-help package also provides it + mv $local_infodir/ctf-spec.info $local_infodir/ctf-spec-%{version}.info + fi + popd } @@ -1235,7 +1240,7 @@ exit 0 %{_infodir}/binutils.info.* %{_infodir}/ld.info.* %{_infodir}/bfd.info.* -%{_infodir}/ctf-spec.info.* +%{_infodir}/ctf-spec*.info.* %{_infodir}/gprof.info.* %{_infodir}/sframe-spec.info.* @@ -1310,6 +1315,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Tue Aug 29 2023 eastb233 - 2.40-3 +- Rename ctf-spec.info in binutils package because gdb-help package also provides it + * Tue Aug 08 2023 eastb233 - 2.40-2 - In X86, change -fpic to -fPIC in PICFLAG -- Gitee