[packages/rpm-pld-macros] rollback to previous %required_jdk version
atler
atler at pld-linux.org
Thu Apr 23 19:15:11 CEST 2026
commit bc0a9fdf3fca43d64b763757e8c6a99e055a2747
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Apr 23 19:12:23 2026 +0200
rollback to previous %required_jdk version
macros.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/macros.java b/macros.java
index 80f1bca..09b8529 100644
--- a/macros.java
+++ b/macros.java
@@ -66,10 +66,9 @@
%use_default_jdk() %{expand:%%global use_jdk %{default_jdk %{?*}}}
# expands to the value with right jdk for BuildRequires header
-# 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}
+# '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})}
%buildrequires_jdk BuildRequires: %required_jdk
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/f4906782cff175ff716e768584787a79ed41f246
More information about the pld-cvs-commit
mailing list