From 7bdcf6e4cd34be16e91663fd639c1ca5e50c4503 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 1 Aug 2024 15:15:41 +0100 Subject: [PATCH] Spec File: Rebase annobin-tmp-default-to-using-group-attach.patch. --- annobin-tmp-default-to-using-group-attach.patch | 16 ++++++++-------- annobin.spec | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/annobin-tmp-default-to-using-group-attach.patch b/annobin-tmp-default-to-using-group-attach.patch index cdab789..ee22dbe 100644 --- a/annobin-tmp-default-to-using-group-attach.patch +++ b/annobin-tmp-default-to-using-group-attach.patch @@ -1,11 +1,11 @@ ---- annobin.orig/gcc-plugin/annobin.cc 2023-06-23 09:52:10.176119281 +0100 -+++ annobin-12.14/gcc-plugin/annobin.cc 2023-06-23 10:06:28.621554381 +0100 -@@ -3155,7 +3155,7 @@ plugin_init (struct plugin_name_args * - versions that are needed. (Note - 2.35.2, as used by RHEL-9, is insufficient). - See BZ 2016458 for an example of where this solution is needed. */ +--- annobin.orig/gcc-plugin/annobin.cc 2024-08-01 15:11:39.354764926 +0100 ++++ annobin-12.65/gcc-plugin/annobin.cc 2024-08-01 15:12:52.266046180 +0100 +@@ -3311,7 +3311,7 @@ plugin_init (struct plugin_name_args * + versions that are needed. (Note - 2.35.2, as used by RHEL-9, is insufficient). + See BZ 2016458 for an example of where this solution is needed. */ #if GCCPLUGIN_VERSION_MAJOR >= 12 -- annobin_attach_type = link_order; -+ annobin_attach_type = group; +- annobin_attach_type = link_order; ++ annobin_attach_type = group; #else - annobin_attach_type = group; + annobin_attach_type = group; #endif diff --git a/annobin.spec b/annobin.spec index 3049c8e..4343e68 100644 --- a/annobin.spec +++ b/annobin.spec @@ -9,7 +9,7 @@ BuildRequires: scl-utils-build Name: %{?scl_prefix}annobin Summary: Annotate and examine compiled binary files Version: 12.65 -Release: 1%{?dist} +Release: 2%{?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 @@ -563,6 +563,9 @@ make check GCC=%gcc_for_annobin #--------------------------------------------------------------------------------- %changelog +* Thu Aug 01 2024 Nick Clifton - 12.65-2 +- Spec File: Rebase annobin-tmp-default-to-using-group-attach.patch. + * Tue Jul 30 2024 Nick Clifton - 12.65-1 - Rebase to 12.65. (RHEL-51018) - Annocheck: Fix recording arguments for later re-use. (RHEL-50802)