From c1b004a586010da0f249550a075b2955ce76ffca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Sun, 14 Apr 2024 05:39:12 -0600 Subject: [PATCH] Spec de Fedora 24.2.2.1 --- rpmbuild/SPECS/libreoffice.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index e7d8995..9b86076 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -2,14 +2,14 @@ ## (rpmautospec version 0.6.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 5; + release_number = 3; 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. @@ -91,7 +91,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.1 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else @@ -339,6 +339,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 Patch500: 0001-disable-libe-book-support.patch # https://lists.freedesktop.org/archives/libreoffice/2023-September/090948.html @@ -2349,9 +2350,12 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog ## START: Generated by rpmautospec -* 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