diff --git a/annobin.spec b/annobin.spec index df231a2..6eda90c 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.48 +Version: 10.50 Release: 1%{?dist} License: GPLv3+ # Maintainer: nickc@redhat.com @@ -190,7 +190,7 @@ hardening options. %global rrcdir /usr/lib/rpm/redhat # Information about the gcc plugin is recorded in this file. -%global aver %{rrcdir}/annobin-plugin-version-info +%global aver annobin-plugin-version-info %endif #--------------------------------------------------------------------------------- @@ -310,14 +310,10 @@ mv %{buildroot}/%{llvm_plugin_dir}/annobin-for-clang.so %{buildroot}/%{clang_plu %if %{with gccplugin} # Record the version of gcc that built this plugin. -mkdir -p %{buildroot}%{rrcdir} -rm -f %{buildroot}%{aver} # Note - we cannot just store %%{gcc_vr} as sometimes the gcc rpm version changes # without the NVR being altered. See BZ #2030671 for more discussion on this. -echo `rpm --query gcc --queryformat '%{version}-%{release}'` > %{buildroot}%{aver} -# Provide a more complete version information string on the second line. -# This is not used by the comparison logic, but makes the file more useful to humans. -echo "%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0 was built by gcc version %{gcc_vr} from the %{version} sources" >> %{buildroot}%{aver} +mkdir -p %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR} +cat `gcc --print-file-name=rpmver` > %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver} # Also install a copy of the sources into the build tree. mkdir -p %{buildroot}%{annobin_source_dir} @@ -361,8 +357,10 @@ fi %endif %if %{with gccplugin} -%{ANNOBIN_GCC_PLUGIN_DIR} -%{aver} +%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so +%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0 +%{ANNOBIN_GCC_PLUGIN_DIR}/annobin.so.0.0.0 +%{ANNOBIN_GCC_PLUGIN_DIR}/%{aver} %{annobin_source_dir}/latest-annobin.tar.xz %endif @@ -377,6 +375,11 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Jan 24 2022 Nick Clifton - 10.50-1 +- Annocheck: Skip property note test for GO binaries. (#204300) +- Annocheck: Add another glibc static library symbol. (#2043047) +- Spec File: Use gcc --print-file-name=rpmver for the gcc version info. + * Mon Jan 17 2022 Nick Clifton - 10.48-1 - GCC Plugin: Do not fail if a section cannot be attached to a group. diff --git a/sources b/sources index 01c71c8..d5854a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.48.tar.xz) = e77af4e9aa6e4176b56e1afd3b9f60e2b1e3b89dde709a3a9ca320665b4b9eed87111aeb972ce1e1d9fd95183b7682102cf7fa02c51cec493f54cba44db6d2af +SHA512 (annobin-10.50.tar.xz) = cb0f8a5c2b02c5039387f73911b9ea83336523696950988efe206c60bf27f83962ce118f7cc99998a4410411b5f2b738c3dbccd614468c20b8987f72ebfa2e1b