From a978ea49fa32121bd190fb68ec212aff3cd0b8e1 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 5 Jul 2021 12:49:37 +0100
Subject: [PATCH] Tests: Skip glibc-notes test if the assembler does not
 support --generate-missing-build-notes. Resolves: #1978573

---
 annobin.spec | 12 ++++++++----
 sources      |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index 987c205..bc5a396 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 9.79
+Version: 9.80
 Release: 1%{?dist}
 License: GPLv3+
 # Maintainer: nickc@redhat.com
@@ -336,8 +336,6 @@ CONFIG_ARGS="$CONFIG_ARGS --without-test"
 CONFIG_ARGS="$CONFIG_ARGS --without-annocheck"
 %endif
 
-%configure ${CONFIG_ARGS} || cat config.log
-
 %set_build_flags
 
 %ifarch %{ix86} x86_64
@@ -345,6 +343,8 @@ CONFIG_ARGS="$CONFIG_ARGS --without-annocheck"
 export CLANG_TARGET_OPTIONS="-fcf-protection"
 %endif
 
+%configure ${CONFIG_ARGS} || cat config.log
+
 %make_build
 
 #---------------------------------------------------------------------------------
@@ -460,8 +460,12 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Mon Jul 05 2021 Nick Clifton  <nickc@redhat.com> - 9.80-1
+- Tests: Skip glibc-notes test if the assembler does not support --generate-missing-build-notes.  (#1978573)
+- Tests: Skip objcopy test if objcopy does not support --merge-notes.
+
 * Tue Jun 29 2021 Nick Clifton  <nickc@redhat.com> - 9.79-1
-- Annocheck: Fix spelling mistake in -,stack-realign failure message.  (#1977349)
+- Annocheck: Fix spelling mistake in -mstack-realign failure message.  (#1977349)
 
 * Mon Jun 21 2021 Nick Clifton  <nickc@redhat.com> - 9.78-1
 - gcc-plugin: Do not record global versions of stack protection settings in LTO mode, if not set.  (#1958954)
diff --git a/sources b/sources
index f05684c..7835505 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-9.79.tar.xz) = cbb8406ad804c2fa3f49ca963c4fd85672a00d864f4ebd645019255b05ff3bc8f4fb07db1f28b8cd1667f09cf4eb23822b8b05f143c39c389433cacc09652d9f
+SHA512 (annobin-9.80.tar.xz) = b3b36d5c0aa2eed07c1a7f59d2e5fdd10aefe1fc27dc9ecabf1cd4aef57004dcd1db7dc69bce29bb7687b5e79d228dd21722753ac5693cfed99156056fcb468d