From 44b43fdac68730722654328a2ac9f53bbb4d627d Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 14 Jan 2025 17:41:15 -0500 Subject: [PATCH] Do not pass nil to _jvmdir macro in cjc logic - 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 --- java-17-openjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 3300dbd..087ff31 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -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 - 1:17.0.14.0.7-2 +- Do not pass nil to _jvmdir macro in cjc logic + * Mon Jan 13 2025 Thomas Fitzsimmons - 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