rpms/java-17-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not pass nil to _jvmdir macro in cjc logic

Browse Source 
- Do not pass nil to _jvmdir macro in cjc logic

Eliminate this rpmbuild warning:
warning: java-17-openjdk.spec: line 2305: unexpected argument to non-parametric macro %_jvmdir

Related: RHEL-73981
Related: RHEL-73559
This commit is contained in:
Thomas Fitzsimmons 2025-01-14 17:41:15 -05:00
parent 7c4e1667e2
commit 44b43fdac6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java-17-openjdk.spec
View File

@ -2311,7 +2311,7 @@ else
end
arg = nil ; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
cjc = require "copy_jdk_configs.lua"
args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
cjc.mainProgram(args)
%post
@ -2508,6 +2508,9 @@ cjc.mainProgram(args)
%endif
%changelog
* Tue Jan 14 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.14.0.7-2
- Do not pass nil to _jvmdir macro in cjc logic
* Mon Jan 13 2025 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.14.0.7-2
- Update to jdk-17.0.14+7 (GA)
- Add to .gitignore openjdk-17.0.14+7.tar.xz