From f1eb635ba8dc76d512257fc7d1718d6516b8024c Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 12 Aug 2024 14:50:06 +0100 Subject: [PATCH] Spec File: Use correct names for the symlinks. Resolves: RHEL-53572 --- .gitignore | 1 + annobin.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2b4536d..3a6b56e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /annobin-12.20.tar.xz /annobin-12.32.tar.xz /annobin-12.65.tar.xz +/annobin-12.69.tar.xz diff --git a/annobin.spec b/annobin.spec index dd791ca..4a0e932 100644 --- a/annobin.spec +++ b/annobin.spec @@ -8,8 +8,8 @@ BuildRequires: scl-utils-build Name: %{?scl_prefix}annobin Summary: Annotate and examine compiled binary files -Version: 12.65 -Release: 3%{?dist} +Version: 12.69 +Release: 1%{?dist} License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -79,11 +79,11 @@ Patch02: annobin-tmp-default-to-using-group-attach.patch BuildRequires: %{?scl_prefix}gcc BuildRequires: %{?scl_prefix}gcc-c++ -# We need the gcc-toolset-13 version of gcc to build annobin, as otherwise the versions will not match. BuildRequires: %{?scl_prefix}annobin-plugin-gcc %{?scl:BuildRequires:%scl_runtime} %{?scl:Requires:%scl_runtime} +# We need the gcc-toolset-N version of gcc in order to run annobin, as otherwise the versions will not match. %{?scl:Requires:%scl_require_package %{scl} gcc} %define gcc_for_annobin %{?_scl_root}/usr/bin/gcc @@ -333,7 +333,7 @@ fi echo "Requires: (%{?scl_prefix}gcc >= %{gcc_major} and %{?scl_prefix}gcc < %{gcc_next})" # NB/ Do not add {?scl_prefix} to the -n option below. The annobin sources -# unpack into a directory called annobin-VERSION not gcc-toolset-13-annobin-VERSION. +# unpack into a directory called annobin-VERSION not gcc-toolset-N-annobin-VERSION. %autosetup -p1 -n annobin-%{version} # The plugin has to be configured with the same arcane configure @@ -479,8 +479,8 @@ cat `%gcc_for_annobin --print-file-name=rpmver` > %{aver} # Also rename the plugin to its GTS variant mv annobin.so.0.0.0 gts-annobin.so.0.0.0 rm -f annobin.so annobin.so.0 gts-annobin.so gts-annobin.so.0 -ln -s gts-annobin.so.0.0 gts-annobin.so -ln -s gts-annobin.so.0.0 gts-annobin.so.0 +ln -s gts-annobin.so.0.0.0 gts-annobin.so +ln -s gts-annobin.so.0.0.0 gts-annobin.so.0 popd @@ -574,6 +574,10 @@ make check GCC=%gcc_for_annobin #--------------------------------------------------------------------------------- %changelog +* Mon Aug 12 2024 Nick Clifton - 12.69-1 +- BuiltBy: Fix seg-fault when comparing language version strings. (RHEL-53497) +- Spec File: Use correct names for the symlinks. (RHEL-53572) + * Fri Aug 09 2024 Nick Clifton - 12.65-3 - Spec File: Use correct names for the symlinks. (RHEL-53572) diff --git a/sources b/sources index b6842bd..26eab62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-12.65.tar.xz) = ebe4736b4691e4d4846dfd0f0b1d417069a2fb7d6f1d176efb8bacd5f685b534e0045fb956fa656d3f41dda425f5140c81974b07ec22c9ccb1ae493122e42b2b +SHA512 (annobin-12.69.tar.xz) = 41a14a2e5a99f9aa08bd54c789c9d8edc4ff7156622c8e42e6bb7f39df1fc2ac343f77b2ad40288f009626dfbb102a0fc98b6e0c2d03d62a18eebdb900f4cbba