From 1acac701a662914ecf1542df853bed6b7b58d228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 20 Jan 2022 21:49:55 +0100 Subject: [PATCH] Make _generate_package_note_file always recreate the file The idea was that we can avoid unnecessary work if the macro is called more than once. But in hindsight this might be risky: let's instead minimize the number of places where the macros is called, but always overwrite the file so that we don't end up with a stale version from a previous build. --- macros.package-notes-srpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.package-notes-srpm b/macros.package-notes-srpm index ba17ef3..2104f34 100644 --- a/macros.package-notes-srpm +++ b/macros.package-notes-srpm @@ -5,4 +5,4 @@ %_package_note_flags %{?_package_note_file:%{?name:-Wl,-dT,%{_package_note_file}}} -%_generate_package_note_file %{?_package_note_file:%{?name:if ! [ -f %{_package_note_file} ] && [ -f %{_rpmconfigdir}/generate-rpm-note.sh ]; then %{_rpmconfigdir}/generate-rpm-note.sh %{name} %{version}-%{release} %{_arch} >%{_package_note_file}; fi}} +%_generate_package_note_file %{?_package_note_file:%{?name:if [ -f %{_rpmconfigdir}/generate-rpm-note.sh ]; then %{_rpmconfigdir}/generate-rpm-note.sh %{name} %{version}-%{release} %{_arch} >%{_package_note_file}; fi}}