[packages/rpm-pld-macros] add %buildrequires_jre_x11; 2.062
atler
atler at pld-linux.org
Fri May 1 02:24:33 CEST 2026
commit 394f647548027afdf0e3483f3bd37623d84f6aca
Author: Jan Palus <atler at pld-linux.org>
Date: Fri May 1 02:23:24 2026 +0200
add %buildrequires_jre_x11; 2.062
macros.java | 3 ++-
rpm-pld-macros.spec | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 7201585..8766f5d 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 2.061
+%define rpm_macros_rev 2.062
%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 3bdf422..39e9f27 100644
--- a/macros.java
+++ b/macros.java
@@ -70,7 +70,8 @@
# The requirement will not replace current 'default' JDK
%required_jdk jdk%{?use_jdk:(%{use_jdk})}
-%buildrequires_jdk BuildRequires: %required_jdk
+%buildrequires_jdk BuildRequires: %required_jdk
+%buildrequires_jre_x11 BuildRequires: jre-X11%{?use_jdk:(%{use_jdk})}
%java_home %{expand:%%global java_home %([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; %{!?use_jdk:unset JAVA_HOME; . %{_javadir}-utils/java-functions >/dev/null 2>&1 && set_jvm >/dev/null 2>&1}%{?use_jdk:JAVA_HOME=%{_jvmdir}/%{use_jdk}}; echo ${JAVA_HOME:-ERROR})}%java_home
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/394f647548027afdf0e3483f3bd37623d84f6aca
More information about the pld-cvs-commit
mailing list