merge 24.2.3.2.fc39

CentOS-9

@@ -1 +0,0 @@
-rpmbuild

rpmbuild/SPECS/libreoffice.spec

@@ -1,6 +1,6 @@
 
 # download path contains version without the last (fourth) digit
-%global libo_version 24.2.2
+%global libo_version 24.2.3
 # 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.
@@ -8,7 +8,7 @@
 # Should contain any suffix of release tarball name, e.g., -buildfix1.
 %global libo_buildfix %{nil}
 # rhbz#715152 state vendor
-%global vendoroption --with-vendor="Strepsirrhini"
+%global vendoroption --with-vendor="INFOTEC"
 %global libo_python python3
 %global libo_python_executable %{__python3}
 %global libo_python_sitearch %{python3_sitearch}
@@ -77,7 +77,7 @@ ExcludeArch:    %{ix86}
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.1
+Version:        %{libo_version}.2
 Release:        3%{?libo_prerelease}%{?dist}
 # default new files are: MPLv2
 # older files are typically: MPLv2 incorporating work under ASLv2
@@ -334,8 +334,6 @@ Patch11: lo-7.6-ppc64le-tests.patch
 # https://bugs.gentoo.org/917618
 # https://bugs.documentfoundation.org/show_bug.cgi?id=158108
 Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
-# Patch for kf6 scaling.
-Patch13: 86abb6fd8a8f680f9fc5ff1db775845c9f4e254b.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
@@ -756,7 +754,7 @@ A plug-in for LibreOffice that enables integration into the KDE Frameworks 6.
 
 %package -n libreofficekit
 Summary: A library providing access to LibreOffice functionality
-License: MPLv2.0
+License: MPL-2.0
 
 %description -n libreofficekit
 LibreOfficeKit can be used to access LibreOffice functionality
@@ -768,7 +766,7 @@ experimental tiled rendering API).
 %package -n libreofficekit-devel
 Summary: Development files for libreofficekit
 Requires: libreofficekit%{?_isa} = %{epoch}:%{version}-%{release}
-License: MPLv2.0
+License: MPL-2.0
 
 %description -n libreofficekit-devel
 The libreofficekit-devel package contains libraries and header files for
@@ -1181,6 +1179,9 @@ sed -i -e /CppunitTest_sw_layoutwriter3/d  sw/Module_sw.mk
 
 %endif
 
+# Failing on multiple arches
+sed -i -e /CppunitTest_svgio/d svgio/Module_svgio.mk
+
 %build
 # path to external tarballs
 EXTSRCDIR=`dirname %{SOURCE0}`
@@ -2403,6 +2404,23 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Thu Jun 27 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-3
+- Merge 24.2.3.2.fc39
+- backport to CentOS 9
+
+* Fri Jun 21 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.3.2-2
+- Backport to Fedora 39
+- Disabled kf6 dependency on fedora < 40
+
+* Thu May 02 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.3.2-1
+- 24.2.3.2
+
+* Mon Apr 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.3.1-1
+- 24.2.3.1
+
+* Sat Apr 13 2024 Miroslav Suchý <msuchy@redhat.com> - 1:24.2.2.1-3
+- convert MPLv2.0 license to SPDX
+
 * Thu Apr 04 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.2-8
 - Backport de 24.2.1.2 para CentOS 9