| |
@@ -1,5 +1,5 @@
|
| |
# download path contains version without the last (fourth) digit
|
| |
- %global libo_version 7.5.5
|
| |
+ %global libo_version 7.6.0
|
| |
# Should contain .alphaX / .betaX, if this is pre-release (actually
|
| |
# pre-RC) version. The pre-release string is part of tarball file names,
|
| |
# so we need a way to define it easily at one place.
|
| |
@@ -57,7 +57,7 @@
|
| |
Summary: Free Software Productivity Suite
|
| |
Name: libreoffice
|
| |
Epoch: 1
|
| |
- Version: %{libo_version}.2
|
| |
+ Version: %{libo_version}.3
|
| |
Release: 3%{?libo_prerelease}%{?dist}
|
| |
# default new files are: MPLv2
|
| |
# older files are typically: MPLv2 incorporating work under ASLv2
|
| |
@@ -126,6 +126,7 @@
|
| |
BuildRequires: perl(Digest::MD5)
|
| |
BuildRequires: perl(FindBin)
|
| |
BuildRequires: perl(base)
|
| |
+ BuildRequires: perl(lib)
|
| |
%if 0%{?fedora}
|
| |
BuildRequires: glibc-all-langpacks
|
| |
BuildRequires: libappstream-glib
|
| |
@@ -223,10 +224,11 @@
|
| |
BuildRequires: pkgconfig(libeot)
|
| |
BuildRequires: pkgconfig(libepubgen-0.1)
|
| |
BuildRequires: pkgconfig(libqxp-0.0)
|
| |
- BuildRequires: pkgconfig(liborcus-0.17)
|
| |
- BuildRequires: pkgconfig(mdds-2.0)
|
| |
+ BuildRequires: pkgconfig(liborcus-0.18)
|
| |
+ BuildRequires: pkgconfig(mdds-2.1)
|
| |
BuildRequires: pkgconfig(zxing)
|
| |
BuildRequires: libnumbertext-devel
|
| |
+ BuildRequires: frozen-static
|
| |
|
| |
%ifarch %{java_arches}
|
| |
# java stuff
|
| |
@@ -243,6 +245,7 @@
|
| |
BuildRequires: google-rubik-fonts
|
| |
# Amiri used in vcl/qa/cppunit tests
|
| |
BuildRequires: amiri-fonts
|
| |
+ BuildRequires: amiri-quran-fonts
|
| |
BuildRequires: liberation-mono-fonts
|
| |
BuildRequires: liberation-narrow-fonts
|
| |
BuildRequires: liberation-sans-fonts
|
| |
@@ -269,12 +272,13 @@
|
| |
Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
|
| |
# TODO investigate these
|
| |
Patch5: 0001-aarch64-failing-here.patch
|
| |
- Patch6: 0001-include-filename-if-the-test-fails.patch
|
| |
# backported
|
| |
- Patch7: 0001-fix-testSignDocument_PEM_PDF.patch
|
| |
Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
|
| |
Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
|
| |
+ Patch10: 0002-Fix-heap-use-after-free.patch
|
| |
# not upstreamed
|
| |
+ # fix FTB in ppc64le from sharkcz
|
| |
+ Patch11: lo-7.6-ppc64le-tests.patch
|
| |
Patch500: 0001-disable-libe-book-support.patch
|
| |
|
| |
%global instdir %{_libdir}
|
| |
@@ -373,7 +377,7 @@
|
| |
Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
|
| |
|
| |
%description base
|
| |
- GUI database front-end for LibreOffice. Allows creation and management of
|
| |
+ GUI database front-end for LibreOffice. Allows creation and management of
|
| |
databases through a GUI.
|
| |
|
| |
%ifarch %{java_arches}
|
| |
@@ -444,7 +448,7 @@
|
| |
|
| |
%description %{fontname}-fonts
|
| |
A dingbats font, OpenSymbol, suitable for use by LibreOffice for bullets and
|
| |
- mathematical symbols.
|
| |
+ mathematical symbols.
|
| |
|
| |
%package writer
|
| |
Summary: LibreOffice Word Processor Application
|
| |
@@ -458,7 +462,7 @@
|
| |
The LibreOffice Word Processor application.
|
| |
|
| |
%package emailmerge
|
| |
- Summary: Email mail-merge component for LibreOffice
|
| |
+ Summary: Email mail-merge component for LibreOffice
|
| |
Requires: %{name}-writer%{?_isa} = %{epoch}:%{version}-%{release}
|
| |
Requires: %{name}-pyuno%{?_isa} = %{epoch}:%{version}-%{release}
|
| |
|
| |
@@ -508,7 +512,7 @@
|
| |
Requires: %{name}-pyuno%{?_isa} = %{epoch}:%{version}-%{release}
|
| |
Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
|
| |
|
| |
- %description math
|
| |
+ %description math
|
| |
The LibreOffice Equation Editor Application.
|
| |
|
| |
%package graphicfilter
|
| |
@@ -1013,14 +1017,31 @@
|
| |
%patch500 -p1
|
| |
%endif
|
| |
|
| |
- # Temporarily disable failig tests
|
| |
- sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le
|
| |
- sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk # aarch64/ppc64*/s390x
|
| |
- sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk # ppc64*
|
| |
- sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk # aarch64/ppc64*
|
| |
- sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk # ppc64le
|
| |
- sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # ppc64le
|
| |
- sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk # s390x
|
| |
+ # Temporarily disable failing tests
|
| |
+ %ifarch ppc64le
|
| |
+ sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
|
| |
+ sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
|
| |
+ sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk
|
| |
+ sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
|
| |
+ sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk
|
| |
+ sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk
|
| |
+ %endif
|
| |
+ %ifarch aarch64
|
| |
+ sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
|
| |
+ sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
|
| |
+ %endif
|
| |
+ %ifarch s390x
|
| |
+ sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
|
| |
+ sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
|
| |
+ sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk
|
| |
+ # https://bugs.documentfoundation.org/show_bug.cgi?id=125978
|
| |
+ sed -i -e s/CustomTarget_uno_test// testtools/Module_testtools.mk
|
| |
+ # failing testTdf149402_vba
|
| |
+ sed -i -e s/CppunitTest_basic_macros// basic/Module_basic.mk
|
| |
+ # Other test exclusions pointed out by sharkcz
|
| |
+ sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk
|
| |
+ sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk
|
| |
+ %endif
|
| |
|
| |
#see rhbz#2072615
|
| |
rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
|
| |
@@ -1113,12 +1134,9 @@
|
| |
%{?archoptions} \
|
| |
%{?flatpakoptions}
|
| |
|
| |
- if ! make verbose=true build; then
|
| |
- echo "build attempt 1 failed"
|
| |
- if ! make verbose=true build; then
|
| |
- echo "build attempt 2 failed"
|
| |
- make verbose=true GMAKE_OPTIONS=-rj1 build
|
| |
- fi
|
| |
+ if ! %make_build; then
|
| |
+ echo "build attempt 1 failed"
|
| |
+ make verbose=true build
|
| |
fi
|
| |
|
| |
#generate the icons and mime type stuff
|
| |
@@ -1220,7 +1238,7 @@
|
| |
|
| |
%make_autocorr_aliases -l en-GB en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT
|
| |
%make_autocorr_aliases -l en-US en-PH
|
| |
- #en-ZA exists and has a good autocorrect file with two or three extras that make sense for
|
| |
+ #en-ZA exists and has a good autocorrect file with two or three extras that make sense for
|
| |
#neighbouring english speaking territories
|
| |
%make_autocorr_aliases -l en-ZA en-NA en-ZW
|
| |
%if %{with langpacks}
|
| |
@@ -1280,7 +1298,7 @@
|
| |
ln -sr %{buildroot}%{lodatadocdir}/CREDITS.fodt %{buildroot}%{baseinstdir}/CREDITS.fodt
|
| |
ln -sr %{buildroot}%{lodatadocdir}/LICENSE.html %{buildroot}%{baseinstdir}/LICENSE.html
|
| |
|
| |
- #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs
|
| |
+ #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs
|
| |
#have snuck through
|
| |
pic=0
|
| |
executable=0
|
| |
@@ -1529,7 +1547,7 @@
|
| |
%{baseinstdir}/program/libdeployment.so
|
| |
%{baseinstdir}/program/libdeploymentgui.so
|
| |
%{baseinstdir}/program/libdlgprovlo.so
|
| |
- %{baseinstdir}/program/libexpwraplo.so
|
| |
+ #%%{baseinstdir}/program/libexpwraplo.so
|
| |
%{baseinstdir}/program/libfps_officelo.so
|
| |
%{baseinstdir}/program/gdbtrace
|
| |
%{baseinstdir}/program/gengal
|
| |
@@ -1561,6 +1579,7 @@
|
| |
%{baseinstdir}/program/libdesktop_detectorlo.so
|
| |
%{baseinstdir}/program/libdict_ja.so
|
| |
%{baseinstdir}/program/libdict_zh.so
|
| |
+ %{baseinstdir}/program/libdocmodello.so
|
| |
%{baseinstdir}/program/libdrawinglayerlo.so
|
| |
%{baseinstdir}/program/libdrawinglayercorelo.so
|
| |
%{baseinstdir}/program/libeditenglo.so
|
| |
@@ -2002,7 +2021,7 @@
|
| |
%{baseinstdir}/program/impress.abignore
|
| |
%endif
|
| |
%{baseinstdir}/program/libPresentationMinimizerlo.so
|
| |
- %{baseinstdir}/program/libPresenterScreenlo.so
|
| |
+ #%%{baseinstdir}/program/libPresenterScreenlo.so
|
| |
%{baseinstdir}/program/libwpftimpresslo.so
|
| |
%dir %{baseinstdir}/share/config/soffice.cfg/simpress
|
| |
%{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml
|
| |
@@ -2242,8 +2261,16 @@
|
| |
%{_includedir}/LibreOfficeKit
|
| |
|
| |
%changelog
|
| |
- * Sun Aug 06 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.5.5.2-3
|
| |
- - Do not setup sources as git repo during build.
|
| |
+ * Wed Aug 23 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-3
|
| |
+ - Disable other failing tests under s390x
|
| |
+ - Add patch to fix FTB under ppc64le
|
| |
+
|
| |
+ * Tue Aug 15 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-2
|
| |
+ - Disable unreliable test under s390x
|
| |
+ - Try verbose make if first build attempt fails
|
| |
+
|
| |
+ * Sun Aug 13 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-1
|
| |
+ - 7.6.0.3
|
| |
|
| |
* Wed Aug 02 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-2
|
| |
- Poppler rebuild.
|
| |