From d24aef25601831c8bd047246d445e51fa1d7e1d0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 27 Jan 2021 14:38:35 +0100 Subject: [PATCH] Make libreoffice-{bsh,rhino} depend on full java, not just java-headless Those two packages' "Tools - Macros - Organize Macros - {BeanShell,JavaScript}..." each have an "Edit" button that wants to bring up a Swing UI, so silently fails with a Java exception if full java does not happen to be installed in addition to libreoffice-core's dependency on java-headless. In theory, a user could always have other LO Java extensions that require non- headless, so the "correct" approach would be to make libreoffice-core depend on full java. But to avoid dependency bloat, only make those sub-packages require it that obviously need it. (The ">= 1:1.6" is carried over from libreoffice-core's java-headless requirement for consistency, even though it is probably cargo-cult by now.) --- libreoffice.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 4d23323..3b7b539 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 8%{?libo_prerelease}%{?dist} +Release: 9%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -355,6 +355,7 @@ databases through a GUI. %package bsh Summary: BeanShell support for LibreOffice Requires: bsh +Requires: java >= 1:1.6 Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} %description bsh @@ -362,6 +363,7 @@ Support BeanShell scripts in LibreOffice. %package rhino Summary: JavaScript support for LibreOffice +Requires: java >= 1:1.6 Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} %description rhino @@ -2271,6 +2273,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Thu Jan 28 2021 Stephan Bergmann - 1:7.0.4.2-9-UNBUILT +- Make libreoffice-bsh, libreoffice-rhino depend on full java + * Wed Jan 27 2021 Caolán McNamara - 1:7.0.4.2-8 - drop unneeded BuildRequires: gdb