Compare commits

..

10 Commits
c10s ... a10s

Author SHA1 Message Date
c05eb7793b Merge imports/c10s/java-25-openjdk-portable-25.0.2.0.10-2.el9 2026-02-21 14:54:44 +00:00
87b9714f8f Merge imports/c10s/java-25-openjdk-portable-25.0.1.0.8-2.el9 2026-02-21 14:54:38 +00:00
3270f5c115 Merge imports/c10s/java-25-openjdk-portable-25.0.1.0.8-1.el9 2026-02-21 14:54:33 +00:00
944ead624c Merge imports/c10s/java-25-openjdk-portable-25.0.0.0.36-2.el9 2026-02-21 14:54:28 +00:00
211716dad2 Merge imports/c10s/java-25-openjdk-portable-25.0.0.0.36-1.el9 2026-02-21 14:54:23 +00:00
60dbf1adad Merge imports/c10s/java-25-openjdk-portable-24.0.2.0.12-1.el9 2026-02-21 14:54:17 +00:00
9ef0077bfc Merge imports/c10s/java-25-openjdk-portable-23.0.2.0.7-1.el9 2026-02-21 14:54:12 +00:00
683444205b Merge imports/c10s/java-25-openjdk-portable-22.0.2.0.9-2.el9 2026-02-21 14:54:07 +00:00
8d5da3cd1b Merge imports/c10s/java-25-openjdk-portable-22.0.2.0.9-1.el9 2026-02-21 14:54:02 +00:00
a33c02e629 Fix portable archive macros for RPM 4.19 %{nil} handling
RPM 4.19 no longer expands double-percentaged %%{nil} passed through
%%{1} in the macro chain. Add ForFiles wrapper macros that pass ""
through %(echo ...) to evaluate the archive names at the shell level,
bypassing the RPM macro expansion issue. Use these in %files sections
instead of the original macros with %%{nil}.
2026-02-21 14:53:50 +00:00

View File

@ -448,6 +448,11 @@
%define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz}
%define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz}
%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""})
%define jdkportablearchiveForFiles() %(echo %{jdkportablearchive -- ""})
%define staticlibsportablearchiveForFiles() %(echo %{staticlibsportablearchive -- ""})
%define jreportablename() %{expand:%{jreportablenameimpl -- %%{1}}}
%define jdkportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
@ -1902,8 +1907,8 @@ done
%files
# main package builds always
%{_jvmdir}/%{jreportablearchive -- %%{nil}}
%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum
%{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
%else
%files
# placeholder
@ -1912,15 +1917,15 @@ done
%if %{include_normal_build}
%files devel
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
%{_jvmdir}/%{jdkportablearchiveForFiles}
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum
%{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%if %{include_staticlibs}
%files static-libs
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}.sha256sum
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
%endif
%files unstripped