From 47ebc1f4f22fd789881b725de021fb8e485273c1d220b1550c30d684586cdbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 24 May 2019 07:24:16 +0000 Subject: [PATCH] - If there is no firebird engine we still need java to run hsqldb bsc#1135189 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=790 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 1e1aeba..791017b 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 24 07:22:08 UTC 2019 - Tomáš Chvátal + +- If there is no firebird engine we still need java to run hsqldb + bsc#1135189 + ------------------------------------------------------------------- Tue May 21 06:33:21 UTC 2019 - Andras Timar diff --git a/libreoffice.spec b/libreoffice.spec index a78c078..92f9904 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -417,6 +417,13 @@ Supplements: %{name} # default database connector %if %{with firebird} Requires: %{name}-base-drivers-firebird +%else +%ifarch %{ix86} +Requires: jre-32 >= 1.6 +%endif +%ifarch x86_64 aarch64 +Requires: jre-64 >= 1.6 +%endif %endif %description base