diff --git a/rpmbuild/SOURCES/patchset-1.1/0003-Custom-images-and-referencies-added.patch b/rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.1/0003-Custom-images-and-referencies-added.patch rename to rpmbuild/SOURCES/0001-Custom-images-and-referencies-added.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0001-Archivos-de-distro-config-de-brand-Office.patch b/rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0001-Archivos-de-distro-config-de-brand-Office.patch rename to rpmbuild/SOURCES/0002-Archivos-de-distro-config-de-brand-Office.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch b/rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0002-Modificacion-al-build-y-borrado-UPDATEURL.patch rename to rpmbuild/SOURCES/0003-Modificacion-al-build-y-borrado-UPDATEURL.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch b/rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0004-Fuentes-monserrat-y-gmx.patch rename to rpmbuild/SOURCES/0004-Fuentes-monserrat-y-gmx.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0005-Fonts-added.patch b/rpmbuild/SOURCES/0005-Fonts-added.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0005-Fonts-added.patch rename to rpmbuild/SOURCES/0005-Fonts-added.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0006-Modificado-archivo-tar-xz-a-gz.patch b/rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0006-Modificado-archivo-tar-xz-a-gz.patch rename to rpmbuild/SOURCES/0006-Modificado-archivo-tar-xz-a-gz.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0007-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0007-Corregida-instrucci-n-de-descarga.patch rename to rpmbuild/SOURCES/0007-Corregida-instrucci-n-de-descarga.patch diff --git a/rpmbuild/SOURCES/patchset-1.1/0010-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.1/0010-Restauracion-link-repos-src.patch rename to rpmbuild/SOURCES/0008-Fuentes-monserrat-y-gmx.patch diff --git a/rpmbuild/SOURCES/patchset-1.1/0007-Corregida-instrucci-n-de-descarga.patch b/rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.1/0007-Corregida-instrucci-n-de-descarga.patch rename to rpmbuild/SOURCES/0009-Corregida-instrucci-n-de-descarga.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0008-Cambios-en-logo.patch b/rpmbuild/SOURCES/0010-Cambios-en-logo.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0008-Cambios-en-logo.patch rename to rpmbuild/SOURCES/0010-Cambios-en-logo.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0009-Modificado-link-de-descarga-de-fuentes.patch b/rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0009-Modificado-link-de-descarga-de-fuentes.patch rename to rpmbuild/SOURCES/0011-Modificado-link-de-descarga-de-fuentes.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0010-Restauracion-link-repos-src.patch b/rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0010-Restauracion-link-repos-src.patch rename to rpmbuild/SOURCES/0012-Restauracion-link-repos-src.patch diff --git a/rpmbuild/SOURCES/patchset-1.0/0011-logo-image-updated.patch b/rpmbuild/SOURCES/0013-logo-image-updated.patch similarity index 100% rename from rpmbuild/SOURCES/patchset-1.0/0011-logo-image-updated.patch rename to rpmbuild/SOURCES/0013-logo-image-updated.patch diff --git a/rpmbuild/SPECS/libreoffice.spec b/rpmbuild/SPECS/libreoffice.spec index 5b8d92c..3cda91c 100644 --- a/rpmbuild/SPECS/libreoffice.spec +++ b/rpmbuild/SPECS/libreoffice.spec @@ -1,9 +1,4 @@ -%ifarch s390x -# https://bugzilla.redhat.com/show_bug.cgi?id=2259004 -%global _lto_cflags %nil -%endif - # download path contains version without the last (fourth) digit %global libo_version 24.2.1 # Should contain .alphaX / .betaX, if this is pre-release (actually @@ -47,6 +42,30 @@ %bcond_with serverconfig %endif +# Disable firebird for RHEL +%if 0%{?rhel} +%bcond_with firebird +%else +%bcond_without firebird +%endif + +# Handle KDE/Qt integration for Fedora and RHEL/EPEL +%if 0%{?rhel} && 0%{?rhel} < 10 +%bcond_with kf5 +%bcond_with kf6 +%endif + +# KDE Plasma 5 integration only for Fedora +%if 0%{?fedora} +%bcond_without kf5 +%endif + +# KDE Plasma 6 integration for Fedora and RHEL/EPEL 10+ +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 +%bcond_without kf6 +%endif + + # generated by %%langpack definitions %global langpack_langs %{nil} @@ -58,8 +77,8 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 4+gob.mx%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +Release: 8%{?libo_prerelease}%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 # nlpsolver is: LGPLv3 @@ -187,7 +206,7 @@ BuildRequires: boost-devel BuildRequires: cups-devel BuildRequires: dragonbox-static BuildRequires: fontpackages-devel -%if 0%{?fedora} +%if %{with firebird} BuildRequires: firebird-devel %endif BuildRequires: frozen-devel @@ -254,9 +273,15 @@ BuildRequires: unixODBC-devel BuildRequires: zxcvbn-c-devel BuildRequires: %{libo_python_executable} +# Uncomment for backtraces +#BuildRequires: gdb + # libs / headers - conditional -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 10 BuildRequires: pkgconfig(libe-book-0.1) +%endif + +%if %{with kf5} BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: kf5-kconfig-devel @@ -267,6 +292,15 @@ BuildRequires: kf5-kio-devel BuildRequires: kf5-kwindowsystem-devel %endif +%if %{with kf6} +BuildRequires: qt6-qtbase-devel +BuildRequires: kf6-kconfig-devel +BuildRequires: kf6-kcoreaddons-devel +BuildRequires: kf6-ki18n-devel +BuildRequires: kf6-kio-devel +BuildRequires: kf6-kwindowsystem-devel +%endif + BuildRequires: gpgmepp-devel BuildRequires: pkgconfig(cppunit) >= 1.14.0 BuildRequires: pkgconfig(graphite2) @@ -341,6 +375,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 +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 @@ -460,7 +495,7 @@ to be written in python. %package base Summary: Database front-end for LibreOffice -%if 0%{?fedora} +%if %{with firebird} Requires: firebird %endif %ifarch %{java_arches} @@ -751,7 +786,7 @@ Supplements: (%{name}-core%{?_isa} and gtk4%{?_isa}) %description gtk4 An experimental plug-in for LibreOffice that enables integration into GTK+ 4 environment. -%if 0%{?fedora} +%if %{with kf5} %package kf5 Summary: LibreOffice KDE Frameworks 5 integration plug-in @@ -763,13 +798,34 @@ Obsoletes: libreoffice-kde4 < 1:6.3.0.0 Obsoletes: libreoffice-kde5 < 1:6.4.7.3 Obsoletes: libreoffice-kde4-debuginfo < 1:6.3.0.0 Obsoletes: libreoffice-kde5-debuginfo < 1:6.4.7.3 +%if (0%{?fedora} && 0%{?fedora} < 40) Supplements: (%{name}-core%{?_isa} and plasma-workspace) +%endif %description kf5 A plug-in for LibreOffice that enables integration into the KDE Frameworks 5. %endif +%if %{with kf6} + +%package kf6 +Summary: LibreOffice KDE Frameworks 6 integration plug-in +Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} +Provides: %{name}-plugin = %{epoch}:%{version}-%{release} +Provides: %{name}-plugin%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: libreoffice-kde4 < 1:6.3.0.0 +Obsoletes: libreoffice-kde5 < 1:6.4.7.3 +Obsoletes: libreoffice-kde4-debuginfo < 1:6.3.0.0 +Obsoletes: libreoffice-kde5-debuginfo < 1:6.4.7.3 +Supplements: (%{name}-core%{?_isa} and plasma-workspace) + +%description kf6 +A plug-in for LibreOffice that enables integration into the KDE Frameworks 6. + +%endif + %package -n libreofficekit Summary: A library providing access to LibreOffice functionality License: MPLv2.0 @@ -1576,6 +1632,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc # Temporarily disable failing tests %ifarch ppc64le sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk +# the following actually succeeded as of 2024-02-23, remove if it succeeds again. +#sed -i -e s/CppunitTest_dbaccess_hsqldb_test// dbaccess/Module_dbaccess.mk %endif %ifarch aarch64 # Nothing to do @@ -1659,15 +1717,11 @@ done ARCH_FLAGS="$ARCH_FLAGS -g1" %endif export ARCH_FLAGS -export CFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn" -export CXXFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn" +export CFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn -I%{_includedir}/KF6/KConfig/" +export CXXFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn -I%{_includedir}/KF6/KConfig/" -%if 0%{?rhel} -%define distrooptions --disable-eot --disable-firebird-sdbc -%else -# fedora -%define distrooptions --enable-eot --enable-kf5 -%endif +# Distro build options +%define distrooptions --enable-eot %{!?with_firebird:--disable-firebird-sdbc} %{?with_kf5:--enable-kf5} %{?with_kf6:--enable-kf6} %ifarch %{java_arches} %define javaoptions --with-java --enable-ext-nlpsolver --enable-ext-wiki-publisher @@ -2473,7 +2527,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %endif %{baseinstdir}/program/libabplo.so %{baseinstdir}/program/libdbplo.so -%if 0%{?fedora} +%if %{with firebird} %{baseinstdir}/program/libfirebird_sdbclo.so %endif %ifarch %{java_arches} @@ -2853,8 +2907,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %endif %{baseinstdir}/program/libvclplug_gtk4lo.so -%if 0%{?fedora} - +%if %{with kf5} %files kf5 %{baseinstdir}/program/kf5.abignore %{baseinstdir}/program/libkf5be1lo.so @@ -2863,6 +2916,14 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %endif +%if %{with kf6} + +%files kf6 +%{baseinstdir}/program/libvclplug_kf6lo.so +%{baseinstdir}/program/libvclplug_qt6lo.so + +%endif + %files -n libreofficekit %{baseinstdir}/share/libreofficekit %{_libdir}/girepository-1.0/LOKDocView-%{girapiversion}.typelib @@ -2876,9 +2937,35 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Thu Apr 04 2024 Sandino Araico Sánchez - 1:24.2.1.2-8 +- Backport de 24.2.1.2 para CentOS 9 + +* Wed Apr 03 2024 Sandino Araico Sánchez - 1:24.2.1.2-6 +- Disable KF6 on Fedora 39 +- liborcus >= 0.19 dependency + +* Mon Mar 18 2024 Gwyn Ciesla - 1:24.2.1.2-5 +- Patch for kf6 scaling + +* Fri Mar 08 2024 Neal Gompa - 1:24.2.1.2-2 +- Rework build conditionals for firebird+kf5+kf6 and fix supplements for + kf5 + +* Mon Mar 04 2024 Gwyn Ciesla - 1:24.2.1.2-1 +- 24.2.1.2, enable kf6 + +* Tue Feb 27 2024 Jiri Vanek - 1:24.2.1.1-7 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Sandino Araico Sánchez - 1:24.2.1.1-4+gob.mx - merge backport de 24.2.1.1 +* Fri Feb 23 2024 Gwyn Ciesla - 1:24.2.1.1-6 +- Re-enable test + +* Fri Feb 23 2024 Gwyn Ciesla - 1:24.2.1.1-5 +- Disable test on ppc64le + * Thu Feb 22 2024 Sandino Araico Sánchez - 1:24.2.0.2-7+gob.mx - Merge 24.2.0.2-el9 @@ -2892,7 +2979,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : - Backport de 24.2.0.2 para CentOS 9 - El __pycache__ ya no se borra -* Wed Feb 21 2024 Gwyn Ciesla - 1:24.2.1.1-2 +* Wed Feb 21 2024 Gwyn Ciesla - 1:24.2.1.1-4 - Draw requires oglrans * Tue Feb 20 2024 Sandino Araico Sánchez - 1:24.2.0.2-4+gob.mx @@ -2901,6 +2988,12 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : * Mon Feb 19 2024 Sandino Araico Sánchez - 1:24.2.0.2-3+gob.mx - Temporarily deleted failing unit tests +* Mon Feb 19 2024 Gwyn Ciesla - 1:24.2.1.1-3 +- Re-enable LTO on s390x + +* Mon Feb 19 2024 Gwyn Ciesla - 1:24.2.1.1-2 +- Re-enable LTO on s390x + * Fri Feb 16 2024 Sandino Araico Sánchez - 1:24.2.0.2-3+gob.mx - Patchset gobmx-1.1_24.2