Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c05eb7793b | |||
| 87b9714f8f | |||
| 3270f5c115 | |||
| 944ead624c | |||
| 211716dad2 | |||
| 60dbf1adad | |||
| 9ef0077bfc | |||
| 683444205b | |||
| 8d5da3cd1b | |||
| a33c02e629 |
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user