From c3121c40f9f9528a8e6552d68ba183c2088ac15b Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Thu, 20 Jun 2024 22:06:57 -0600 Subject: [PATCH 1/3] Spec de Fedora 24.2.3.2-2 --- rpmbuild/SPECS/libreoffice.spec | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 9b86076..e390a51 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -1,15 +1,15 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.6.1) +## (rpmautospec version 0.6.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 3; + release_number = 2; 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.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. @@ -91,7 +91,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 +Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else @@ -339,8 +339,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 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 @@ -751,7 +749,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 @@ -763,7 +761,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 @@ -1138,6 +1136,9 @@ sed -i -e /CppunitTest_sd_png_export_tests/d sd/Module_sd.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}` @@ -2350,6 +2351,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog ## START: Generated by rpmautospec +* 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 From 427fba04177e9d81c5e05f3fa45a67045308a623 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 10:40:31 -0600 Subject: [PATCH 2/3] Dependencia hacia kf6 deshabilitada en fedora < 40 --- CentOS-9 | 1 - Fedora-38 | 1 - rpmbuild/SPECS/libreoffice.spec | 15 +++++++-------- 3 files changed, 7 insertions(+), 10 deletions(-) delete mode 120000 CentOS-9 delete mode 120000 Fedora-38 diff --git a/CentOS-9 b/CentOS-9 deleted file mode 120000 index 8dcc934..0000000 --- a/CentOS-9 +++ /dev/null @@ -1 +0,0 @@ -rpmbuild \ No newline at end of file diff --git a/Fedora-38 b/Fedora-38 deleted file mode 120000 index 023c254..0000000 --- a/Fedora-38 +++ /dev/null @@ -1 +0,0 @@ -CentOS-9 \ No newline at end of file diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index e390a51..15a3464 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -17,12 +17,7 @@ # Should contain any suffix of release tarball name, e.g., -buildfix1. %global libo_buildfix %{nil} # rhbz#715152 state vendor -%if 0%{?rhel} -%global vendoroption --with-vendor="Red Hat, Inc." -%endif -%if 0%{?fedora} -%global vendoroption --with-vendor="The Fedora Project" -%endif +%global vendoroption --with-vendor="INFOTEC" %global libo_python python3 %global libo_python_executable %{__python3} %global libo_python_sitearch %{python3_sitearch} @@ -75,7 +70,7 @@ %endif # KDE Plasma 6 integration for Fedora and RHEL/EPEL 10+ -%if 0%{?fedora} || 0%{?rhel} >= 10 +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 %bcond_without kf6 %endif @@ -95,7 +90,7 @@ Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else -Release: %autorelease +Release: 2 %endif # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -2351,6 +2346,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog ## START: Generated by rpmautospec +* Fri Jun 21 2024 Sandino Araico Sánchez - 1:24.2.3.2-2 +- Backport to Fedora 39 +- Disabled kf6 dependency on fedora < 40 + * Thu May 02 2024 Gwyn Ciesla - 1:24.2.3.2-1 - 24.2.3.2 From e609af8ed13457333404b6993b799dd152c3199f Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 21 Jun 2024 13:02:34 -0600 Subject: [PATCH 3/3] Rollback: autorelease --- rpmbuild/SPECS/libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 15a3464..b332e4c 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; + 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}} @@ -90,7 +90,7 @@ Version: %{libo_version}.2 %if 0%{?libo_prerelease} Release: %autorelease -e %{?libo_prerelease} %else -Release: 2 +Release: %autorelease %endif # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2