From e77b2689916137008e582f77bac2ab861d20c7e2 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 - Related: RHEL-73867 Eliminate this rpmbuild warning: warning: java-17-openjdk.spec: line 2305: unexpected argument to non-parametric macro %_jvmdir --- java-17-openjdk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index ef96cce..02ad05e 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -2302,7 +2302,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 @@ -2499,6 +2499,10 @@ 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 +- Related: RHEL-73867 + * Mon Jan 13 2025 Jiri Vanek - 1:17.0.14.0.7-2 - Adapt to newest cjc to fix issue with rpm 4.17 - Disable copy-jdk-configs for Flatpak builds