Skip to content

Commit ac1a1cd

Browse files
committed
rpm: make package require java17 or java21
Motivation: dCache can run with java 17 as well as java 21. However, if a side decided to run dcache with java21, the RPM will pull java17 as dependency anyway. Modification: Make RPM require java 17 or 21. Result: If java is not installed, rpm will pull java17. If java21 is already installed, then no extra java packages will be pulled. Acked-by: Karen Hoyos Target: master, 11.2 Require-book: no Require-notes: yes (cherry picked from commit 5fe6ec9) Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
1 parent f706e98 commit ac1a1cd

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

packages/fhs/src/main/rpm/dcache-server.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Requires(pre): shadow-utils
1313
Requires: which
1414
Requires: hostname
1515
Requires: procps-ng
16-
Requires: java-17-headless
16+
Requires: (java-17-headless or jre-21-headless)
1717

1818
%{?systemd_requires}
1919
BuildRequires: systemd

0 commit comments

Comments
 (0)