From 0ac536d492274b5b7b273c894475380785612184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 2 Aug 2021 19:09:50 +0100 Subject: [PATCH] rhbz#1969393 firebird is unavailable on s390x at the moment --- libreoffice.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 48bc052..cca1b7a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,9 +54,6 @@ 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/ -# rhbz#1969393 firebird is unavailable at the moment -ExcludeArch: s390x - Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz Source1: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc Source2: %{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz @@ -130,7 +127,9 @@ BuildRequires: boost-devel BuildRequires: cups-devel BuildRequires: fontpackages-devel %if 0%{?fedora} +%ifnarch s390x BuildRequires: firebird-devel +%endif BuildRequires: libqrcodegencpp-devel %endif BuildRequires: glm-devel @@ -341,8 +340,10 @@ 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} @@ -1062,8 +1063,12 @@ export CXXFLAGS=$ARCH_FLAGS %define distrooptions --disable-eot --disable-scripting-beanshell --disable-scripting-javascript --disable-firebird-sdbc --disable-qrcodegen %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}' @@ -1856,8 +1861,10 @@ 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