From atler at pld-linux.org  Mon Apr 20 12:17:28 2026
From: atler at pld-linux.org (Jan Palus)
Date: Mon, 20 Apr 2026 12:17:28 +0200
Subject: [packages/rpm-pld-macros] 2.058; try to get stable java
 environment (javadoc binaries etc)
In-Reply-To: <a2d9cc8f60181039622675a391aff1850856f884_refs_heads_master@pld-linux.org>
References: <a47985f67d786bdb6ff4a1088e3390597d11f1df_refs_heads_master@pld-linux.org>
 <a2d9cc8f60181039622675a391aff1850856f884_refs_heads_master@pld-linux.org>
Message-ID: <aeX7LoMgYBLRaPfi@pine>

On 04.04.2026 22:24, arekm wrote:
> 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}

Please don't. This was specifically designed not to rely on PATH for any
java stuff but to use non-conflicting *-base-* packages and JAVA_HOME
instead. 

This change is the reason java-xalan failed today.

If there is an issue with some package I'm even willing to help with
packaging rather then going back to "BuildRequires: jdk" and packages
having all sorts of kinky ClassDataVersion because one time jdk11 was
required for libreoffice and another time jdk23 for eclipse-jdt.