diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 993850d..0d74ec5 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -1,15 +1,6 @@ -## START: Set by rpmautospec -## (rpmautospec version 0.6.1) -## RPMAUTOSPEC: autorelease, autochangelog -%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 5; - base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); - print(release_number + base_release_number - 1); -}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} -## END: Set by rpmautospec # download path contains version without the last (fourth) digit -%global libo_version 24.2.1 +%global libo_version 24.2.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. @@ -86,8 +77,8 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 9+gob.mx1.2%{?dist} +Version: %{libo_version}.1 +Release: 3+gob.mx1.2%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -372,6 +363,7 @@ 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 de gob.mx @@ -2879,15 +2871,21 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Sat Jun 22 2024 Sandino Araico Sánchez - 1:24.2.2.1-3+gob.mx1.2 +- merge 24.2.2.1.fc40 + * Fri Jun 21 2024 Sandino Araico Sánchez - 1:24.2.1.2-9+gob.mx1.2 - Rebuild * Thu Mar 28 2024 Sandino Araico Sánchez - 1:24.2.1.2-6+gob.mx1.2 - Patchset gob.mx 1.2 -* Mon Mar 18 2024 Gwyn Ciesla - 1:24.2.1.2-5 +* Mon Mar 18 2024 Gwyn Ciesla - 1:24.2.2.1-2 - Patch for kf6 scaling +* Wed Mar 13 2024 Gwyn Ciesla - 1:24.2.2.1-1 +- 24.2.2.1 + * Fri Mar 08 2024 Neal Gompa - 1:24.2.1.2-2 - Rework build conditionals for firebird+kf5+kf6 and fix supplements for kf5