From c7a54c92371fbdf5fb0aed1545100a24d678dd3f Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 20 Feb 2026 14:13:56 +0000 Subject: [PATCH] Fix portable archive name macros to expand %{nil} argument Use %{expand:%{1}} instead of %{1} in the sed replacement of jreportablenameimpl, jdkportablenameimpl, and staticlibsportablenameimpl to force recursive macro expansion. This ensures %{nil} passed from the %files section is properly expanded to empty rather than appearing literally in filenames. --- java-21-openjdk-portable.specfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index 736e385..bd6a4bf 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -445,9 +445,9 @@ %define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}} # portable only declarations %global jreimage jre -%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jre;g") -%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jdk;g") -%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.static-libs;g") +%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{expand:%{1}}.jre;g") +%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{expand:%{1}}.jdk;g") +%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{expand:%{1}}.static-libs;g") %define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz} %define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz} %define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}