allow using %use_default_jdk in argless fasion; 2.022

diff --git a/macros.java b/macros.java
index 28e48ba7d153c822d9a47b28cc6132988fcb4507..8b014f4bb497d0e76c7946efb92df66f83aa1103 100644 (file)
--- 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

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 640aafbc60f43b4e675bf4ac244cee3db1562177..7a7d2b1b09f62e438fedeaa80b7e233802a644d4 100644 (file)
--- 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