From 190997130964e91f949c34495f53603cc19c72d1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 14 Oct 2021 15:59:59 +0100 Subject: [PATCH] Re-enable use of annobin plugin when building annobin. Resolves: #2013658 --- annobin.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/annobin.spec b/annobin.spec index 788f78e..5b6a8ca 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ # Maintainer: nickc@redhat.com # Web Page: https://sourceware.org/annobin/ @@ -37,7 +37,7 @@ License: GPLv3+ # 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. @@ -346,10 +346,10 @@ fi %doc %{_datadir}/doc/annobin-plugin/annotation.proposal.txt %{_infodir}/annobin.info* %{_mandir}/man1/annobin.1* -%{_mandir}/man1/built-by.1* -%{_mandir}/man1/check-abi.1* -%{_mandir}/man1/hardened.1* -%{_mandir}/man1/run-on-binaries-in.1* +%exclude %{_mandir}/man1/built-by.1* +%exclude %{_mandir}/man1/check-abi.1* +%exclude %{_mandir}/man1/hardened.1* +%exclude %{_mandir}/man1/run-on-binaries-in.1* %if %{with clangplugin} %{clang_plugin_dir}/annobin-for-clang.so @@ -374,6 +374,10 @@ fi #--------------------------------------------------------------------------------- %changelog +* Thu Oct 14 2021 Nick Clifton - 10.15-2 +- Re-enable use of annobin plugin when building annobin. (#2013658) +- Exclude man pages for uninstalled scripts. (#2013562) + * Wed Oct 13 2021 Nick Clifton - 10.15-1 - Annocheck: Add tests based upon recent bug fixes. - Annocheck: Another tweak to glibc detection code.