From 7fb30195527ee7cd5cb381beacd544ad2faa2a60 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Wed, 21 Dec 2022 16:30:48 +0000
Subject: [PATCH] Improve handling of tool versions. Resolves: #2151308

---
 annobin.spec | 11 ++++++++++-
 sources      |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index 0fb6ddd..3a61d02 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 10.97
+Version: 10.99
 Release: 1%{?dist}
 License: GPLv3+
 # Maintainer: nickc@redhat.com
@@ -261,7 +261,12 @@ make -C gcc-plugin clean
 BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so"
 
 # Disable the standard annobin plugin so that we do get conflicts.
+# Note - Fedora's rpm uses a different way of evaluating macros. 
+%if 0%{?fedora} == 0
 OPTS="$(rpm --eval '%undefine _annotated_build %build_cflags %build_ldflags')"
+%else
+OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')"
+%endif
 
 # If building on RHEL7, enable the next option as the .attach_to_group
 # assembler pseudo op is not available in the assembler.
@@ -361,6 +366,10 @@ exit $res
 #---------------------------------------------------------------------------------
 
 %changelog
+* Wed Dec 21 2022 Nick Clifton  <nickc@redhat.com> - 10.99-1
+- Annocheck: Improve handling of tool versions.
+- GCC plugin: Fix building with gcc-13.
+
 * Fri Dec 16 2022 Nick Clifton  <nickc@redhat.com> - 10.97-1
 - Annocheck: Add test for binaries built by cross compilers.
 
diff --git a/sources b/sources
index 2982247..48309aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-10.97.tar.xz) = 3d9f302fbf69c388c760e67c953464b36410d3ad10cd489e5eb15ec5c9d1272775a9a8ac6ded4a89807b5d651e765ae2782143113de878eb525c562250039a4e
+SHA512 (annobin-10.99.tar.xz) = 601bd90aa4b6528f595efebf5b864aae5176e8e9d80c7f9cf77a1252b85a15c8440866a1f4881176f6bb50418c037e8924f32456533e90de473dae8abe92d53e