Annocheck: Improve handling of tool versions

annobin.spec

@@ -1,11 +1,12 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 10.97
+Version: 10.99
 Release: 1%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/annobin/
 # Maintainer: nickc@redhat.com
+# Web Page: https://sourceware.org/annobin/
 # Watermark Protocol: https://fedoraproject.org/wiki/Toolchain/Watermark
 
 #---------------------------------------------------------------------------------
@@ -37,7 +38,7 @@ URL: https://sourceware.org/annobin/
 # checking logic or when building on RHEL-7 or earlier.
 %global with_hard_gcc_version_requirement 1
 
-%bcond_with plugin_rebuild
+%bcond_without plugin_rebuild
 # Allow the building of annobin without using annobin itself.
 # This is because if we are bootstrapping a new build environment we can have
 # a new version of gcc installed, but without a new of annobin installed.
@@ -394,7 +395,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 systems with an assembler that does not support the
 # .attach_to_group pseudo op (eg RHEL-7) then enable the next line.
@@ -472,16 +478,19 @@ fi
 
 %if %{with llvmplugin}
 %files plugin-llvm
+%dir %{llvm_plugin_dir}
 %{llvm_plugin_dir}/annobin-for-llvm.so
 %endif
 
 %if %{with clangplugin}
 %files plugin-clang
+%dir %{clang_plugin_dir}
 %{clang_plugin_dir}/annobin-for-clang.so
 %endif
 
 %if %{with gccplugin}
 %files plugin-gcc
+%dir %{ANNOBIN_GCC_PLUGIN_DIR}
 %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so
 %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0
 %{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0
@@ -503,6 +512,11 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Wed Dec 21 2022 Nick Clifton  <nickc@redhat.com> - 10.99-1
+- Annocheck: Improve handling of tool versions.
+- Spec File: Fix building with plugin_rebuild enabled.
+- 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.
 - Annocheck: Improve heuristic used to detect binaries without code. (#2144533)

sources

@@ -1 +1 @@
-SHA512 (annobin-10.97.tar.xz) = 3d9f302fbf69c388c760e67c953464b36410d3ad10cd489e5eb15ec5c9d1272775a9a8ac6ded4a89807b5d651e765ae2782143113de878eb525c562250039a4e
+SHA512 (annobin-10.99.tar.xz) = 601bd90aa4b6528f595efebf5b864aae5176e8e9d80c7f9cf77a1252b85a15c8440866a1f4881176f6bb50418c037e8924f32456533e90de473dae8abe92d53e