merge backports/fedora-39

This commit is contained in:
Sandino Araico Sánchez 2024-09-17 17:29:58 -06:00
commit 67cc8b8826

View file

@ -1,6 +1,6 @@
# download path contains version without the last (fourth) digit # download path contains version without the last (fourth) digit
%global libo_version 24.8.0 %global libo_version 24.8.1
# Should contain .alphaX / .betaX, if this is pre-release (actually # Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names, # 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. # so we need a way to define it easily at one place.
@ -77,8 +77,8 @@ ExcludeArch: %{ix86}
Summary: Free Software Productivity Suite Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.3 Version: %{libo_version}.2
Release: 7+gob.mx1.5%{?dist} Release: 5+gob.mx1.5%{?dist}
# default new files are: MPLv2 # default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2 # older files are typically: MPLv2 incorporating work under ASLv2
@ -355,19 +355,11 @@ Patch0: 0001-don-t-suppress-crashes.patch
Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch
# rhbz#1736810 disable opencl by default again # rhbz#1736810 disable opencl by default again
Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# backported
#Patch3: 0001-default-to-sifr-for-gnome-light-mode.patch
# backported
#Patch4: py313.patch
# not upstreamed # not upstreamed
# fix FTB in ppc64le from sharkcz # fix FTB in ppc64le from sharkcz
# https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html # https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html
Patch11: lo-7.6-ppc64le-tests.patch Patch11: lo-7.6-ppc64le-tests.patch
Patch12: cflags.patch Patch12: cflags.patch
# icu 74 compatibility patch, from gentoo, via arch linux
# https://bugs.gentoo.org/917618
# https://bugs.documentfoundation.org/show_bug.cgi?id=158108
#Patch12: libreoffice-7.5.8.2-icu-74-compatibility.patch
# Patchset gob.mx 1.5 # Patchset gob.mx 1.5
Patch21: libreoffice-24.8.0.3+gobmx1.5-patchset.patch Patch21: libreoffice-24.8.0.3+gobmx1.5-patchset.patch
@ -2875,6 +2867,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Tue Sep 17 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-4+gob.mx1.5
- merge backports/fedora-39
* Sat Sep 14 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.1.2-3
- Backport to Fedora 39
* Wed Sep 11 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.8.1.2-1
- 24.8.1.2
* Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-7+gob.mx1.5 * Mon Sep 09 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.8.0.3-7+gob.mx1.5
- Backport to Fedora 39 - Backport to Fedora 39