[packages/libreoffice] depend on openjdk11 specifically to avoid conflict with java8
atler
atler at pld-linux.org
Thu Aug 12 20:36:36 CEST 2021
commit a98388aa5e76bfe11754da18ffa1505a117a7ece
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Aug 12 20:34:29 2021 +0200
depend on openjdk11 specifically to avoid conflict with java8
openjdk11 is the only maintained provider of jdk >= 1.9 as of this
writing and it's more sensible to keep java8 as default jdk/jre
libreoffice.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 35b157f..2be682f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -57,6 +57,8 @@
%define major_ver 7.2.0
%define qt5_ver 5.6
+%define use_jdk openjdk11
+
Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
Name: libreoffice
@@ -252,8 +254,9 @@ BuildRequires: zlib-devel
%if %{with java}
BuildRequires: ant >= 1.7.0
BuildRequires: ant-apache-regexp
-BuildRequires: jdk >= 1.9
-BuildRequires: jre >= 1.9
+BuildRequires: openjdk11-jdk-base
+BuildRequires: openjdk11-jre-base
+BuildRequires: openjdk11-jre-base-X11
%endif
%if %{with kde5}
BuildRequires: kf5-kconfig-devel >= 5.0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/a98388aa5e76bfe11754da18ffa1505a117a7ece
More information about the pld-cvs-commit
mailing list