diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index fd3249a..d05c52a 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -453,6 +453,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 @@ -1869,8 +1874,8 @@ done %files # main package builds always -%{_jvmdir}/%{jreportablearchive -- %%{nil}} -%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum +%{_jvmdir}/%{jreportablearchiveForFiles} +%{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum %else %files # placeholder @@ -1879,15 +1884,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