diff --git a/libreoffice.spec b/libreoffice.spec index 8ea1068..fdda01d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -20,7 +20,7 @@ %define langpacks 1 Name: libreoffice -Version: 7.1.4.1 +Version: 7.1.4.2 Release: 1mamba Summary: Free Office Suite Group: Graphical Desktop/Applications/Office @@ -62,10 +62,11 @@ Patch45: libreoffice-6.4.3.2-build-workaround-fix-deleteTestDirectory-fail Patch46: libreoffice-6.4.3.2-libpoppler-0.87.patch License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain ## AUTOBUILDREQ-BEGIN -#liblapack.so.3()(64bit): .so link not found BuildRequires: firebird-devel BuildRequires: glibc-devel -BuildRequires: java-openjdk8-runtime +%ifnarch aarch64 +BuildRequires: java-openjdk8 +%endif BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel @@ -168,8 +169,6 @@ BuildRequires: autoconf BuildRequires: bc BuildRequires: binutils BuildRequires: bison -#BuildRequires: debianutils -#BuildRequires: which BuildRequires: desktop-file-utils BuildRequires: findutils BuildRequires: flex @@ -198,6 +197,11 @@ BuildRequires: xproto-devel BuildRequires: xulrunner-devel BuildRequires: npapi-sdk-devel # java stuff +%if %with_system_hsqldb +BuildRequires: java-hsqldb1 < 1.8.1 +%endif +BuildRequires: java-bsh2 >= 2.0b4 +%ifnarch aarch64 BuildRequires: apache-ant BuildRequires: java-pentaho-libxml BuildRequires: java-flute @@ -210,10 +214,6 @@ BuildRequires: jakarta-commons-codec == 1.3 BuildRequires: jakarta-commons-httpclient == 3.1 BuildRequires: jakarta-commons-lang == 2.3 BuildRequires: jakarta-commons-logging == 1.1.1 -%if %with_system_hsqldb -BuildRequires: java-hsqldb1 < 1.8.1 -%endif -BuildRequires: java-bsh2 >= 2.0b4 #BuildRequires: java-lucene #BuildRequires: java-lucene-contrib #BuildRequires: java-junit48 @@ -222,6 +222,7 @@ BuildRequires: postgresql-jdbc BuildRequires: java-saxon9 >= 9.1.0.7 %endif BuildRequires: java-pentaho-reporting-flow-engine +%endif BuildRequires: hunspell-es BuildRequires: hyphen-es BuildRequires: mythes-es @@ -229,7 +230,7 @@ BuildRequires: mythes-it BuildRequires: valgrind BuildRequires: python-lxml-py3 # Past added library requirements that maybe no longer required -BuildRequires: libSampleICC-devel +#BuildRequires: libSampleICC-devel #BuildRequires: libmdds0-devel >= 0.8 #BuildRequires: libixion-devel >= 0.5 BuildRequires: libglm-devel @@ -246,8 +247,8 @@ BuildRequires: libidn-devel BuildRequires: libodbc-devel BuildRequires: libpoppler-glib-devel #BuildRequires: libportaudio-devel -BuildRequires: libpython-devel -BuildRequires: libsablotron-devel +#BuildRequires: libpython-devel +#BuildRequires: libsablotron-devel BuildRequires: libsane-backends-devel #BuildRequires: libsilgraphite-devel BuildRequires: libvigra-devel @@ -1056,6 +1057,9 @@ This package contains %{langname} translations and resources for LibreOffice.\ %langpack -l zu -n Zulu -F -H -Y %changelog +* Thu Jun 10 2021 Automatic Build System 7.1.4.2-1mamba +- automatic version update by autodist + * Sun May 30 2021 Silvan Calarco 7.1.4.1-1mamba - update to 7.1.4.1