The package rpms/libreoffice.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=80725a....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 54c27aa77536e0df6afba9e9422b55ff35740705
Merge: 3db041c 80725ad
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Fri Sep 24 17:31:47 2021 +0200
Merge branch 'rawhide' into f35
commit 80725ad1fcd92e60150a57965c26d909552c3129
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Wed Sep 22 14:34:34 2021 +0200
Enable check also for s390x
...and for now disable the handful of tests that only fail on s390x, until they
have been debugged and fixed:
* CppunitTest_dbaccess_hsqlbinary_import:
[_RUN_____] HsqlBinaryImportTest::testBinaryImport
/builddir/build/BUILD/libreoffice-7.2.1.2/dbaccess/qa/unit/hsql_binary_import.cxx:67:HsqlBinaryImportTest::testBinaryImport
equality assertion failed
- Expected: laser eye
- Actual :
HsqlBinaryImportTest::testBinaryImport finished in: 383ms
* CppunitTest_vcl_svm_test:
[_RUN_____] SvmTest::testBitmaps
/builddir/build/BUILD/libreoffice-7.2.1.2/test/source/xmltesttools.cxx:171:SvmTest::testBitmaps
equality assertion failed
- Expected: b8dee5da
- Actual : 5e01ddcc
- In <>, attribute 'crc' of '/metafile/bmp[1]' incorrect value.
SvmTest::testBitmaps finished in: 0ms
[_RUN_____] SvmTest::testBitmapExs
/builddir/build/BUILD/libreoffice-7.2.1.2/test/source/xmltesttools.cxx:171:SvmTest::testBitmapExs
equality assertion failed
- Expected: d8377d4f
- Actual : 08feb5d3
- In <>, attribute 'crc' of '/metafile/bmpex[1]' incorrect value.
SvmTest::testBitmapExs finished in: 2ms
* CustomTarget_testtools/uno_test:
### float does not match! failed
struct comparison test failed
### float does not match! failed
recursive test results failed
standard test failed
diff --git a/libreoffice.spec b/libreoffice.spec
index b0df884..5cf15e2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1015,6 +1015,11 @@ sed -i -e /CppunitTest_xmlsecurity_signing/d
xmlsecurity/Module_xmlsecurity.mk
sed -i -e /CppunitTest_xmlsecurity_pdfsigning/d xmlsecurity/Module_xmlsecurity.mk
sed -i -e /CppunitTest_sal_osl/d sal/Module_sal.mk
sed -i -e /CppunitTest_emfio_emf/d emfio/Module_emfio.mk
+%ifarch s390x
+sed -i -e /CppunitTest_dbaccess_hsqlbinary_import/d dbaccess/Module_dbaccess.mk
+sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk
+sed -i -e /CustomTarget_uno_test/d testtools/Module_testtools.mk
+%endif
# git commit -q -a -m 'temporarily disable failing tests'
@@ -1511,11 +1516,9 @@ for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do
done
%check
-%ifnarch s390x
make unitcheck slowcheck
# we don't need this anymore
rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
-%endif
%files
commit 32b64bcc77b6ffe1d7e6f3eb8739111276972bda
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Fri Sep 10 09:52:27 2021 +0100
remove obscure rhino and bsh scripting for fedora >= 36
aligning fedora with rhel
diff --git a/libreoffice.spec b/libreoffice.spec
index 00fd77c..b0df884 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: 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/
@@ -66,7 +66,7 @@ Source8: libreoffice-multiliblauncher.sh
Source9: %{external_url}/dtoa-20180411.tgz
Source10: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} < 36
Source11: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Source12: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
%endif
@@ -77,7 +77,7 @@ Source14:
%{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3
%global bundling_options %{?bundling_options} --without-system-hsqldb
Provides: bundled(hsqldb) = 1.8.0
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} < 36
Provides: bundled(rhino) = 1.5
%endif
Provides: bundled(xsltml) = 2.1.2
@@ -217,7 +217,7 @@ BuildRequires: libnumbertext-devel
# java stuff
BuildRequires: ant
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} < 36
BuildRequires: bsh
%endif
BuildRequires: java-devel
@@ -307,9 +307,9 @@ Obsoletes: libreoffice-headless < 1:4.4.0.0
Obsoletes: libreoffice-math-debuginfo < 1:6.4.7.2
Provides: libreoffice-headless = %{epoch}:%{version}-%{release}
Provides: libreoffice-headless%{?_isa} = %{epoch}:%{version}-%{release}
-%if 0%{?rhel}
-Obsoletes: libreoffice-bsh < 1:6.2.2.3
-Obsoletes: libreoffice-rhino < 1:6.2.2.3
+%if 0%{?fedora} > 35 || 0%{?rhel}
+Obsoletes: libreoffice-bsh < 1:7.3.0.4
+Obsoletes: libreoffice-rhino < 1:7.3.0.4
%endif
%description core
@@ -343,7 +343,7 @@ Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
GUI database front-end for LibreOffice. Allows creation and management of
databases through a GUI.
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} < 36
%package bsh
Summary: BeanShell support for LibreOffice
Requires: bsh
@@ -1052,8 +1052,12 @@ export CXXFLAGS=$ARCH_FLAGS
%define distrooptions --disable-eot --disable-scripting-beanshell
--disable-scripting-javascript --disable-firebird-sdbc
%else
# fedora
+%if 0%{?fedora} > 35
+%define distrooptions --enable-eot --enable-kf5 --disable-scripting-beanshell
--disable-scripting-javascript
+%else
%define distrooptions --enable-eot --enable-kf5
%endif
+%endif
%if %{with langpacks}
%define with_lang --with-lang='%{langpack_langs}'
@@ -1093,8 +1097,6 @@ touch autogen.lastrun
--enable-introspection \
--enable-odk \
--enable-release-build \
- --enable-scripting-beanshell \
- --enable-scripting-javascript \
--enable-symbols \
--with-build-version="%{version}-%{release}" \
--with-external-dict-dir=/usr/share/myspell \
@@ -1873,7 +1875,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{_bindir}/oobase
%{_mandir}/man1/oobase.1*
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} < 36
%files bsh
%{baseinstdir}/program/classes/ScriptProviderForBeanShell.jar
%{baseinstdir}/program/services/scriptproviderforbeanshell.rdb
@@ -2246,6 +2248,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Fri Sep 10 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-2
+- remove obscure rhino and bsh scripting for fedora >= 36 like in rhel
+
* Thu Sep 09 2021 Caolán McNamara <caolanm(a)redhat.com> - 1:7.2.1.2-1
- upgrade to 7.2.1