merge 7.4.2.3-fc37

CentOS-9/SPECS/libreoffice.spec

@@ -1,5 +1,5 @@
 # download path contains version without the last (fourth) digit
-%global libo_version 7.4.1
+%global libo_version 7.4.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.
@@ -61,7 +61,7 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        %{libo_version}.2
+Version:        %{libo_version}.3
 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/
@@ -1006,6 +1006,9 @@ git commit -q -m 'add Red Hat colors to palette' extras/source/palettes/standard
 
 # apply patches
 %autopatch -M 99
+%if 0%{?rhel}
+%patch500 -p1
+%endif
 
 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
@@ -2294,9 +2297,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Tue Oct 25 2022 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.4.2.3-2
+- compile on CentOS 9
+
 * Mon Oct 24 2022 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.4.1.2-2
 - compile on CentOS 9
 
+* Thu Oct 13 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.4.2.3-1
+- 7.4.2 release
+
 * Wed Sep 21 2022 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.4.0.3-2
 - compile on CentOS 9