Skip to content

Commit 50f228b

Browse files
keszybzbluca
authored andcommitted
Make sure redhat-package-notes spec is skipped if _package_note_flags is undefined
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=2184553. The proposed fix was provided by Adam Williamson.
1 parent 5ffab3c commit 50f228b

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

rpm/macros.package-notes-srpm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

2323
# Overall status: 1 if looks like we can insert the note, 0 otherwise
2424
# Unfortunately "clang" does not support specs files so the note insertion is disabled when using it.
25-
%_package_note_status %[0%{?_package_note_file:1} && 0%{?name:1} && "%_target_cpu" != "noarch" && "%{toolchain}" != "clang" ? 1 : 0]
25+
%_package_note_status %{!?_package_note_flags:0}%{?_package_note_flags:%[0%{?_package_note_file:1} && 0%{?name:1} && "%_target_cpu" != "noarch" && "%{toolchain}" != "clang" ? 1 : 0]}
26+
2627

2728
# The linker flags to be passed to the compiler to insert the notes section will
2829
# be created by the spec file, to avoid issues with quoting and escaping across

0 commit comments

Comments
 (0)