[packages/rpm-pld-macros] allow using %use_default_jdk in argless fasion; 2.022

[atler]

commit 9aa247e66a5d62552cf58acf0c90d0434f8ec21f
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 8 11:35:49 2023 +0100

    allow using %use_default_jdk in argless fasion; 2.022

 macros.java         | 2 +-
 rpm-pld-macros.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 640aafb..7a7d2b1 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.021
+%define		rpm_macros_rev	2.022
 %define		find_lang_rev	1.41
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
diff --git a/macros.java b/macros.java
index 28e48ba..8b014f4 100644
--- a/macros.java
+++ b/macros.java
@@ -63,7 +63,7 @@
 %default_jdk()			%{expand:%%define __jdk_v %{?1}%{!?1:%default_jdk_version}}%{expand:%%define __jdk_vf %{expr:%__jdk_v < %min_jdk_version ? %min_jdk_version : %__jdk_v}}%{expand:%%{?default_jdk%{__jdk_vf}}}%{expand:%%{!?default_jdk%{__jdk_vf}:%default_jdk_provider%{__jdk_vf}}}%{expand:%%undefine __jdk_vf}%{expand:%%undefine __jdk_v}
 
 # Use default JDK in spec, optionally takes requested minimum version as argument
-%use_default_jdk()		%{expand:%%global use_jdk %{default_jdk %*}}
+%use_default_jdk()		%{expand:%%global use_jdk %{default_jdk %{?*}}}
 
 # expands to the value with right jdk for BuildRequires header
 # 'jdk' if %%use_jdk is not defined,  jdk(%%use_jdk) otherwise
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/9aa247e66a5d62552cf58acf0c90d0434f8ec21f