Related: rhbz#1969393 can now renable firebird support on s390x

f41
Caolán McNamara 3 years ago
parent 544652338a
commit d6ec438d90

@ -126,10 +126,8 @@ BuildRequires: boost-devel
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
%if 0%{?fedora} %if 0%{?fedora}
%ifnarch s390x
BuildRequires: firebird-devel BuildRequires: firebird-devel
%endif %endif
%endif
BuildRequires: glm-devel BuildRequires: glm-devel
BuildRequires: hyphen-devel BuildRequires: hyphen-devel
BuildRequires: libjpeg-turbo-devel BuildRequires: libjpeg-turbo-devel
@ -333,10 +331,8 @@ to be written in python.
%package base %package base
Summary: Database front-end for LibreOffice Summary: Database front-end for LibreOffice
%if 0%{?fedora} %if 0%{?fedora}
%ifnarch s390x
Requires: firebird Requires: firebird
%endif %endif
%endif
Requires: pentaho-reporting-flow-engine Requires: pentaho-reporting-flow-engine
Requires: postgresql-jdbc Requires: postgresql-jdbc
Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} 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 %define distrooptions --disable-eot --disable-scripting-beanshell --disable-scripting-javascript --disable-firebird-sdbc
%else %else
# fedora # fedora
%ifarch s390x
%define distrooptions --enable-eot --enable-kf5 --disable-firebird-sdbc
%else
%define distrooptions --enable-eot --enable-kf5 %define distrooptions --enable-eot --enable-kf5
%endif %endif
%endif
%if %{with langpacks} %if %{with langpacks}
%define with_lang --with-lang='%{langpack_langs}' %define with_lang --with-lang='%{langpack_langs}'
@ -1865,10 +1857,8 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libabplo.so %{baseinstdir}/program/libabplo.so
%{baseinstdir}/program/libdbplo.so %{baseinstdir}/program/libdbplo.so
%if 0%{?fedora} %if 0%{?fedora}
%ifnarch s390x
%{baseinstdir}/program/libfirebird_sdbclo.so %{baseinstdir}/program/libfirebird_sdbclo.so
%endif %endif
%endif
%{baseinstdir}/program/libhsqldb.so %{baseinstdir}/program/libhsqldb.so
%{baseinstdir}/program/librptlo.so %{baseinstdir}/program/librptlo.so
%{baseinstdir}/program/librptuilo.so %{baseinstdir}/program/librptuilo.so

Loading…
Cancel
Save