[packages/rpm-pld-macros] 2.058; try to get stable java environment (javadoc binaries etc)

[arekm]

commit a2d9cc8f60181039622675a391aff1850856f884
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 22:24:17 2026 +0200

    2.058; try to get stable java environment (javadoc binaries etc)

 macros.java         | 7 ++++---
 rpm-pld-macros.spec | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index c1068a0..737222d 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.057
+%define		rpm_macros_rev	2.058
 %define		find_lang_rev	1.42
 # 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 2c2ef21..80f1bca 100644
--- a/macros.java
+++ b/macros.java
@@ -66,9 +66,10 @@
 %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
-# The requirement will not replace current 'default' JDK
-%required_jdk	jdk%{?use_jdk:(%{use_jdk})}
+# When %%use_jdk is set, require full JDK package (with /usr/bin/javac etc.)
+# to ensure correct JDK tools are in PATH when multiple JDK -base packages
+# are co-installed.
+%required_jdk	%{?use_jdk:%{use_jdk}-jdk}%{!?use_jdk:jdk}
 
 %buildrequires_jdk BuildRequires: %required_jdk
 
================================================================

---- gitweb:

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