Spec de Fedora 7.6.2.1-2

CentOS-9/SPECS/libreoffice.spec

@@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%global libo_version 7.6.0
+%global libo_version 7.6.2
 # 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.
@@ -7,7 +7,12 @@
 # Should contain any suffix of release tarball name, e.g., -buildfix1.
 %global libo_buildfix %{nil}
 # rhbz#715152 state vendor
-%global vendoroption --with-vendor="Strepsirrhini"
+%if 0%{?rhel}
+%global vendoroption --with-vendor="Red Hat, Inc."
+%endif
+%if 0%{?fedora}
+%global vendoroption --with-vendor="The Fedora Project"
+%endif
 %global libo_python python3
 %global libo_python_executable %{__python3}
 %global libo_python_sitearch %{python3_sitearch}
@@ -53,7 +58,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?dist}
 # default new files are: MPLv2
 # older files are typically: MPLv2 incorporating work under ASLv2
 # nlpsolver is: LGPLv3
@@ -78,9 +83,8 @@ Source7:        http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c31
 Source8:        libreoffice-multiliblauncher.sh
 
 Source9:        %{external_url}/dtoa-20180411.tgz
-Source10:       %{external_url}/dragonbox-1.1.3.tar.gz
 Source11:       %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we loose
+#Unfortunately later versions of hsqldb changed the file format, so if we use a later version we lose
 #backwards compatability.
 Source12:       %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 Source13:       %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
@@ -110,7 +114,6 @@ BuildRequires: findutils
 BuildRequires: flex
 BuildRequires: gcc-c++
 BuildRequires: gettext
-BuildRequires: git
 BuildRequires: gnupg2
 BuildRequires: gperf
 BuildRequires: hunspell-en-US
@@ -122,6 +125,7 @@ BuildRequires: patch
 BuildRequires: perl(Digest::MD5)
 BuildRequires: perl(FindBin)
 BuildRequires: perl(base)
+BuildRequires: perl(lib)
 %if 0%{?fedora}
 BuildRequires: glibc-all-langpacks
 BuildRequires: libappstream-glib
@@ -134,11 +138,11 @@ BuildRequires: %{libo_python}-setuptools
 BuildRequires: Box2D-devel
 BuildRequires: boost-devel
 BuildRequires: cups-devel
+BuildRequires: dragonbox-static
 BuildRequires: fontpackages-devel
 %if 0%{?fedora}
 BuildRequires: firebird-devel
 %endif
-BuildRequires: frozen-devel
 BuildRequires: glm-devel
 BuildRequires: hyphen-devel
 BuildRequires: libjpeg-turbo-devel
@@ -224,6 +228,7 @@ BuildRequires: pkgconfig(liborcus-0.18)
 BuildRequires: pkgconfig(mdds-2.1)
 BuildRequires: pkgconfig(zxing)
 BuildRequires: libnumbertext-devel
+BuildRequires: frozen-static
 
 %ifarch %{java_arches}
 # java stuff
@@ -238,8 +243,10 @@ BuildRequires: dejavu-sans-fonts
 BuildRequires: dejavu-serif-fonts
 BuildRequires: google-carlito-fonts
 BuildRequires: google-rubik-fonts
+BuildRequires: google-crosextra-caladea-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
@@ -264,18 +271,16 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 # backported
 Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
 Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
-# TODO investigate these
-Patch5: 0001-aarch64-failing-here.patch
 # backported
-Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
+Patch5: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
-Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
+Patch6: limit-tests-giving-dubious-results-to-x86_64.patch
-# backported fix
-# https://gerrit.libreoffice.org/c/core/+/153386/2#message-06ee95be419a14ee8f08035142b5718e0377d120
-Patch10: 0001-cui-fix-without-java-build.patch
-Patch11: 0002-cui-don-t-build-SvxJavaClassPathDlg-SetClassPath-for.patch
-
 # not upstreamed
+# fix FTB in ppc64le from sharkcz
+# https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html
+Patch11: lo-7.6-ppc64le-tests.patch
 Patch500: 0001-disable-libe-book-support.patch
+# https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html
+Patch501: kahansum_test_fix_for_aarc64_s390x.patch
 
 %global instdir %{_libdir}
 %global baseinstdir %{instdir}/libreoffice
@@ -373,7 +378,7 @@ Requires: %{name}-pyuno%{?_isa} = %{epoch}:%{version}-%{release}
 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 +449,7 @@ BuildArch: noarch
 
 %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 +463,7 @@ Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
 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 +513,7 @@ Requires: %{name}-pdfimport%{?_isa} = %{epoch}:%{version}-%{release}
 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
@@ -997,11 +1002,6 @@ gpgv2 --keyring ./keyring.gpg %{SOURCE5} %{SOURCE4}
 %setup -q -n %{name}-%{version}%{?libo_prerelease} -b 2 -b 4
 rm -rf git-hooks */git-hooks
 
-# This is normally done by %%autosetup -S git_am,
-# but that does not work with multiple -b options, so we use plain %%setup above
-%global __scm git_am
-%__scm_setup_git_am -q
-
 #Customize Palette to add Red Hat colours
 (head -n -1 extras/source/palettes/standard.soc && \
  echo -e '  <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
@@ -1011,36 +1011,44 @@ rm -rf git-hooks */git-hooks
   <draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
  tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
 mv -f redhat.soc extras/source/palettes/standard.soc
-git commit -q -m 'add Red Hat colors to palette' extras/source/palettes/standard.soc
 
 # apply patches
-%autopatch -M 99
+%autopatch -p1 -M 99
 %if 0%{?rhel}
 %patch500 -p1
 %endif
 
-sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk # ppc64le
+%ifarch aarch64 s390x
-sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk # aarch64/ppc64*/s390x
+%patch501 -p1
-sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk # ppc64*
+%endif
-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
+# Temporarily disable failing tests
-sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk # ppc64le
+%ifarch ppc64le
-sed -i -e s/CppunitTest_sw_macros_test// sw/Module_sw.mk # s390x
+sed -i -e /CppunitTest_sc_array_functions_test/d sc/Module_sc.mk
-# Pruebas unitarias que fallan en la 7.6.0
+sed -i -e /CppunitTest_sc_addin_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_tiledrendering/d sc/Module_sc.mk
+sed -i -e /CppunitTest_sc_financial_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_ucalc_formula\\s/d sc/Module_sc.mk
+sed -i -e /CppunitTest_sc_statistical_functions_test/d sc/Module_sc.mk
-sed -i -e /CppunitTest_sc_subsequent_filters_test2/d sc/Module_sc.mk
+sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk
-sed -i -e /CppunitTest_sw_layoutwriter\\s/d sw/Module_sw.mk
+sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk
+%endif
+%ifarch aarch64
+# Nothing to do
+%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
-git rm vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
+rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff
-
-git commit -q -a -m 'temporarily disable failing tests'
-
-# Seeing .git dir makes some of the build tools change their behavior.
-# We do not want that. Note: it is still possible to use
-# git --git-dir=.git-rpm
-mv .git .git-rpm
 
 %build
 # path to external tarballs
@@ -1053,7 +1061,7 @@ for i in $RPM_OPT_FLAGS; do
         esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-%ifarch s390 s390x %{arm} aarch64
+%ifarch s390 s390x %{arm}
 # these builders typically do not have enough memory to link the big libs with -g2
 ARCH_FLAGS="$ARCH_FLAGS -g1"
 %endif
@@ -1116,7 +1124,6 @@ touch autogen.lastrun
  --without-export-validation \
  --without-fonts \
  --without-lxml \
- --without-system-dragonbox \
  --without-system-libfixmath \
  --with-gdrive-client-secret="GYWrDtzyZQZ0_g5YoBCC6F0I" \
  --with-gdrive-client-id="457862564325.apps.googleusercontent.com" \
@@ -1130,12 +1137,9 @@ touch autogen.lastrun
  %{?archoptions} \
  %{?flatpakoptions}
 
-if ! make verbose=true build; then
+if ! %make_build; then
-    echo "build attempt 1 failed"
+  echo "build attempt 1 failed"
-    if ! make verbose=true build; then
+  make verbose=true build
-        echo "build attempt 2 failed"
-        make verbose=true GMAKE_OPTIONS=-rj1 build
-    fi
 fi
 
 #generate the icons and mime type stuff
@@ -1237,7 +1241,7 @@ pushd %{buildroot}%{baseinstdir}/share/autocorr
 
 %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}
@@ -1297,7 +1301,7 @@ rm -f %{buildroot}%{baseinstdir}/CREDITS.fodt %{buildroot}%{baseinstdir}/LICENSE
 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
@@ -1479,12 +1483,9 @@ export DESTDIR=%{buildroot}
 
 %if 0%{?flatpak}
 # Assemble the libreoffice-*.appdata.xml files into a single
-# org.libreoffice.LibreOffice.appdata.xml; first create the single file:
+# org.libreoffice.LibreOffice.appdata.xml:
-solenv/bin/assemble-flatpak-appdata-step1.sh \
+solenv/bin/assemble-flatpak-appdata.sh \
  %{buildroot}%{_datadir}/metainfo/ 0
-# ...then append the original files to the single file:
-solenv/bin/assemble-flatpak-appdata-step2.sh \
- %{buildroot}%{_datadir}/metainfo/ %{buildroot}%{_datadir}/metainfo/
 rm %{buildroot}%{_datadir}/metainfo/libreoffice-*.appdata.xml
 %endif
 
@@ -1549,7 +1550,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{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
@@ -2023,7 +2024,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
 %{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
@@ -2263,10 +2264,38 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
-* Tue Aug 08 2023 Sandino Araico Sánchez <sandino@sandino.net> 1:7.6.0.2-1
+* Sun Oct 01 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.2.1-2
-- 7.6.0.2
+- Add patch 501 for failing tests on aarc64 and s390x
-- Removed some failing unit tests 
+
-- Backport cui/source/options/optjava.cxx fixes
+* Sat Sep 30 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.2.1-1
+- 7.6.2.1
+
+* Fri Sep 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.6.1.2-1
+- 7.6.1.2
+
+* Mon Sep 04 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.1.1-2
+- Unbundle dragonbox
+
+* Mon Aug 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.6.1.1-1
+- 7.6.1.1
+
+* Sun Aug 27 2023 Mattia Verga <mattia.verga@proton.me> - 1:7.6.0.3-4
+- Remove test exclusions from aarch64
+- Link aarch64 executable with standard -g level
+
+* 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.
 
 * Mon Jul 31 2023 Gwyn Ciesla <gwync@protonmail.com> - 1:7.5.5.2-1
 - 7.5.5.2