diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index f954f1b..f1c900f 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/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. @@ -364,8 +364,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 # Parches gob.mx 1.2 Patch21: 0001-Archivos-de-distro-config-de-brand-Office.patch @@ -389,7 +387,6 @@ Patch38: 0018-Eliminar-with-package-version-de-nuestras-distro-con.patch Patch39: 0019-Eliminar-with-jdk-home-de-nuestras-distro-configs.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 @@ -812,7 +809,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 @@ -824,7 +821,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 @@ -1646,6 +1643,9 @@ sed -i -e /CppunitTest_sc_subsequent_export_test4/d sc/Module_sc.mk #see rhbz#2072615 rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff +# Failing on multiple arches +sed -i -e /CppunitTest_svgio/d svgio/Module_svgio.mk + %build # path to external tarballs EXTSRCDIR=`dirname %{SOURCE0}` @@ -2873,6 +2873,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Tue Jun 25 2024 Sandino Araico Sánchez - 1:24.2.3.2-2+gob.mx1.2 +- Merge 24.2.3.2.fc40 + * Mon Jun 24 2024 Sandino Araico Sánchez - 1:24.2.2.2-5+gob.mx1.2 - Temporarily disabled patch for kf6 scaling - Added NotoKufiArabic-v2.109.zip to sources @@ -2888,6 +2891,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : * Thu Mar 28 2024 Sandino Araico Sánchez - 1:24.2.1.2-6+gob.mx1.2 - Patchset gob.mx 1.2 +* Thu May 02 2024 Gwyn Ciesla - 1:24.2.3.2-1 +- 24.2.3.2 + +* Mon Apr 29 2024 Gwyn Ciesla - 1:24.2.3.1-1 +- 24.2.3.1 + +* Sat Apr 13 2024 Miroslav Suchý - 1:24.2.2.1-3 +- convert MPLv2.0 license to SPDX + * Mon Mar 18 2024 Gwyn Ciesla - 1:24.2.2.1-2 - Patch for kf6 scaling