From d32fe6caa279fd13066f78fa2439fae503e9b90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 21 Jan 2022 15:52:38 +0100 Subject: [PATCH] Also voidify the macros if we're on a noarch build IIUC, the normal %ifarch syntax cannot be used, because the definition needs to be inline. The best I could find is %_target_cpu, which seems to be set to "noarch" for noarch builds. --- macros.package-notes-srpm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros.package-notes-srpm b/macros.package-notes-srpm index 52e247b..1f52e51 100644 --- a/macros.package-notes-srpm +++ b/macros.package-notes-srpm @@ -3,6 +3,6 @@ # for details. %_package_note_file %{_builddir}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld -%_package_note_flags %{?_package_note_file:%{?name:-Wl,-dT,%{_package_note_file}}} +%_package_note_flags %{?_package_note_file:%{?name:%["%_target_cpu" == "noarch"?"":"-Wl,-dT,%{_package_note_file}"]}} -%_generate_package_note_file %{?_package_note_file:%{?name:if [ -f %{_rpmconfigdir}/generate-rpm-note.sh ]; then %{_rpmconfigdir}/generate-rpm-note.sh ${RPM_PACKAGE_NAME:?} ${RPM_PACKAGE_VERSION:?}-${RPM_PACKAGE_RELEASE:?} ${RPM_ARCH:?} >%{_package_note_file}; fi}} +%_generate_package_note_file %{?_package_note_file:%{?name:%["%_target_cpu" == "noarch"?"":"if [ -f %{_rpmconfigdir}/generate-rpm-note.sh ]; then %{_rpmconfigdir}/generate-rpm-note.sh ${RPM_PACKAGE_NAME:?} ${RPM_PACKAGE_VERSION:?}-${RPM_PACKAGE_RELEASE:?} ${RPM_ARCH:?} >%{_package_note_file}; fi"]}}