diff --git a/libreoffice.spec b/libreoffice.spec index 91b9258..a9cdf14 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.4 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?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/ @@ -126,10 +126,8 @@ BuildRequires: boost-devel BuildRequires: cups-devel BuildRequires: fontpackages-devel %if 0%{?fedora} -%ifnarch s390x BuildRequires: firebird-devel %endif -%endif BuildRequires: glm-devel BuildRequires: hyphen-devel BuildRequires: libjpeg-turbo-devel @@ -333,10 +331,8 @@ to be written in python. %package base Summary: Database front-end for LibreOffice %if 0%{?fedora} -%ifnarch s390x Requires: firebird %endif -%endif Requires: pentaho-reporting-flow-engine Requires: postgresql-jdbc Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} @@ -1058,12 +1054,8 @@ export CXXFLAGS=$ARCH_FLAGS %define distrooptions --disable-eot --disable-scripting-beanshell --disable-scripting-javascript --disable-firebird-sdbc %else # fedora -%ifarch s390x -%define distrooptions --enable-eot --enable-kf5 --disable-firebird-sdbc -%else %define distrooptions --enable-eot --enable-kf5 %endif -%endif %if %{with langpacks} %define with_lang --with-lang='%{langpack_langs}' @@ -1075,6 +1067,10 @@ autoconf SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=$[${SMP_MFLAGS/-j/}] +%ifarch armv7hl +SMP_MFLAGS=2 +%endif + %if 0%{?flatpak} %define flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar --with-boost-libdir=%{_libdir} --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} %endif @@ -1861,10 +1857,8 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libabplo.so %{baseinstdir}/program/libdbplo.so %if 0%{?fedora} -%ifnarch s390x %{baseinstdir}/program/libfirebird_sdbclo.so %endif -%endif %{baseinstdir}/program/libhsqldb.so %{baseinstdir}/program/librptlo.so %{baseinstdir}/program/librptuilo.so @@ -2254,6 +2248,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Fri Aug 20 2021 Caolán McNamara - 1:7.2.0.4-2 +- s390x firebird is available again + * Mon Aug 16 2021 Caolán McNamara - 1:7.2.0.4-1 - upgrade to 7.2.0