From 93d9a169021ed6beb6d5bd795a675b6dc73c9ddf Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 4 Feb 2021 08:58:16 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libreoffice.git#5f506101d00b272f899d91ccf7a40c66f7bd68e2 --- libreoffice.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 4d23323..c8ccb96 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 @@ -1086,7 +1088,7 @@ SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=$[${SMP_MFLAGS/-j/}] %if 0%{?flatpak} -%global flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar --with-commons-logging-jar=/app/share/java/commons-logging.jar --with-external-dict-dir=/app/share/myspell --with-external-hyph-dir=/app/share/hyphen --with-external-thes-dir=/app/share/mythes --with-flute-jar=/app/share/java/flute.jar --with-jfreereport-jar=/app/share/java/flow-engine.jar --with-libbase-jar=/app/share/java/libbase.jar --with-libfonts-jar=/app/share/java/libfonts.jar --with-libformula-jar=/app/share/java/libformula.jar --with-liblayout-jar=/app/share/java/liblayout.jar --with-libloader-jar=/app/share/java/libloader.jar --with-librepository-jar=/app/share/java/librepository.jar --with-libserializer-jar=/app/share/java/libserializer.jar --with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir} +%global flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar --with-commons-logging-jar=/app/share/java/commons-logging.jar --with-external-dict-dir=/app/share/myspell --with-external-hyph-dir=/app/share/hyphen --with-external-thes-dir=/app/share/mythes --with-flute-jar=/app/share/java/flute.jar --with-jdk-home=/app/lib/jvm/java --with-jfreereport-jar=/app/share/java/flow-engine.jar --with-libbase-jar=/app/share/java/libbase.jar --with-libfonts-jar=/app/share/java/libfonts.jar --with-libformula-jar=/app/share/java/libformula.jar --with-liblayout-jar=/app/share/java/liblayout.jar --with-libloader-jar=/app/share/java/libloader.jar --with-librepository-jar=/app/share/java/librepository.jar --with-libserializer-jar=/app/share/java/libserializer.jar --with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir} %if 0%{?rhel} %global flatpakoptions %{flatpakoptions} --with-boost-libdir=%{_libdir} %endif @@ -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