From d1b777b6621f0b28a775c347cbffd12affba259f Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Mon, 10 Mar 2025 15:22:05 -0300 Subject: [PATCH] Generate latest-annobin.tar.xz at %prep Generate a source tarball for annobin during the prep phase, after all the patches have been applied. Use this new tarball when installing the annobin source code for the GCC plugin. On distros without downstream patches, this change should not produce any changes. Resolves: RHEL-83034 --- annobin.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 344d1c5..08caf8c 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 12.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -325,6 +325,10 @@ touch configure */configure Makefile.in */Makefile.in # Similarly we do not want to rebuild the documentation. touch doc/annobin.info +# Generate a source tarball for installation later with all the patches +# applied. This must be the last step in the prep section. +tar -C ../ -cJf ../latest-annobin.tar.xz %{name}-%{version} + #--------------------------------------------------------------------------------- %build @@ -454,7 +458,7 @@ cat `gcc --print-file-name=rpmver` > %{buildroot}/%{ANNOBIN_GCC_PLUGIN_DIR}/%{av # Also install a copy of the sources into the build tree. mkdir -p %{buildroot}%{annobin_source_dir} -cp %{_sourcedir}/%{annobin_sources} %{buildroot}%{annobin_source_dir}/latest-annobin.tar.xz +cp ../latest-annobin.tar.xz %{buildroot}%{annobin_source_dir}/latest-annobin.tar.xz %endif rm -f %{buildroot}%{_infodir}/dir @@ -533,6 +537,9 @@ make check #--------------------------------------------------------------------------------- %changelog +* Tue Mar 11 2025 Tulio Magno Quites Machado Filho - 12.92-2 +- Generate latest-annobin.tar.xz at prep phase (RHEL-83034) + * Fri Feb 14 2025 Nick Clifton - 12.92-1 - Annocheck: Do not rely upon libelf's ability to detect links to separate debuginfo files. (RHEL-79473)