From f34c7e3258fcd048761718ad8c87f537fc318d7c Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Wed, 24 Jan 2024 16:57:01 -0600 Subject: [PATCH 1/3] =?UTF-8?q?Subida=20de=20versi=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CentOS-9/SPECS/libreoffice.spec | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/CentOS-9/SPECS/libreoffice.spec b/CentOS-9/SPECS/libreoffice.spec index 71e90ff..c0a1f5c 100644 --- a/CentOS-9/SPECS/libreoffice.spec +++ b/CentOS-9/SPECS/libreoffice.spec @@ -53,7 +53,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 +Version: %{libo_version}.2 Release: 1 # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -878,6 +878,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %langpack -l id -n Indonesian -F -H -Y -T -X %langpack -l it -n Italian -F -H -Y -M -A -T -X %langpack -l ja -n Japanese -F -A -s cjk -T -X +%{baseinstdir}/share/template/common/l10n/ja_ott_normal.ott %langpack -l kk -n Kazakh -F -H -X %langpack -l kn -n Kannada -F -H -Y -X %langpack -l ko -n Korean -F -H -A -s cjk -T -X @@ -984,6 +985,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %autocorr -l sl -n Slovenian %autocorr -l sr -n Serbian %autocorr -l sv -n Swedish +%autocorr -l th -n Thai %autocorr -l tr -n Turkish %autocorr -l vi -n Vietnamese %autocorr -l vro -n Võro @@ -1048,6 +1050,17 @@ sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk %endif +%if 0%{?rhel} +# Pruebas unitarias que fallan en 24.2.0.1 +sed -i -e /CppunitTest_sc_ucalc_formula\ /d sc/Module_sc.mk +sed -i -e /CppunitTest_sdext_pdfimport/d sdext/Module_sdext.mk +sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk +sed -i -e /CppunitTest_sw_htmlimport/d sw/Module_sw.mk +sed -i -e /CppunitTest_sw_layoutwriter/d sw/Module_sw.mk # Se borran todas, 1 2 y 3 +sed -i -e /CppunitTest_sw_uiwriter6/d sw/Module_sw.mk +%endif + + #see rhbz#2072615 rm -f vcl/qa/cppunit/graphicfilter/data/tiff/fail/CVE-2017-9936-1.tiff @@ -1646,7 +1659,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libucbhelper.so %{baseinstdir}/program/libucpchelp1.so %{baseinstdir}/program/libucpdav1.so -%{baseinstdir}/program/libucpftp1.so +#%{baseinstdir}/program/libucpftp1.so %{baseinstdir}/program/libucphier1.so %{baseinstdir}/program/libucppkg1.so %{baseinstdir}/program/libunordflo.so @@ -1740,7 +1753,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/share/config/soffice.cfg/modules %{baseinstdir}/share/config/soffice.cfg/*/ui %{baseinstdir}/share/palette -%{baseinstdir}/share/config/webcast +#%{baseinstdir}/share/config/webcast %{baseinstdir}/share/config/wizard %dir %{baseinstdir}/share/dtd %{baseinstdir}/share/dtd/officedocument @@ -2183,7 +2196,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{libo_python_sitearch}/__pycache__/uno.cpython-* %{libo_python_sitearch}/__pycache__/unohelper.cpython-* %{libo_python_sitearch}/__pycache__/officehelper.cpython-* -%{baseinstdir}/share/registry/pyuno.xcd +#%{baseinstdir}/share/registry/pyuno.xcd %files librelogo %{baseinstdir}/share/registry/librelogo.xcd @@ -2263,10 +2276,16 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Thu Jan 18 2024 Sandino Araico Sánchez - 24.2.0.1-1 +* Wed Jan 24 2024 Sandino Araico Sánchez - 24.2.0.2-1 +- Subida de versión +- autocorr para Thai + +* Tue Jan 23 2024 Sandino Araico Sánchez - 24.2.0.1-1 - Subida de versión - Requerimiento de gcc-12 para compilación usando gcc-toolset-12 - Dependencias: liborcus 0.19 y libargon2 +- Pruebas unitarias que fallan, temporalmente borradas +- Correcciones en la sección %files * Fri Dec 08 2023 Gwyn Ciesla - 1:7.6.4.1-1 - 7.6.4.1 From 08e8ac44634d64913b5b275cd76c56f5b127065e Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Wed, 21 Feb 2024 13:50:14 -0600 Subject: [PATCH 2/3] Spec de Fedora 24.2.0.2-5 --- CentOS-9/SPECS/libreoffice.spec | 64 ++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/CentOS-9/SPECS/libreoffice.spec b/CentOS-9/SPECS/libreoffice.spec index 2eb9b2e..f3e1fe2 100644 --- a/CentOS-9/SPECS/libreoffice.spec +++ b/CentOS-9/SPECS/libreoffice.spec @@ -1,15 +1,20 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.3.5) +## (rpmautospec version 0.5.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 1; + 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 +%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 7.6.4 +%global libo_version 24.2.0 # 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. @@ -67,7 +72,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 @@ -83,7 +88,7 @@ Release: %autorelease # writerperfect/source/common/DirectoryStream.cxx: MPLv2 or LGPLv2+ # extras/source/autocorr/lang/hr/license.md: GPL 2.0 or LGPL2 or MPLv1.1 # odk/examples/java/...: 3 clause BSD -License: MPL-2.0 AND Apache-2.0 AND LGPL-3.0-only AND LGPL-3.0-or-later AND CC0-1.0 AND BSD-3-Clause AND (LGPL-2.1-only OR SISSL) AND (MPL-2.0 OR LGPL-3.0-or-later) AND (MPL-2.0 OR LGPL-2.1-or-later) AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-only) +License: MPL-2.0 AND Apache-2.0 AND LGPL-3.0-only AND LGPL-3.0-or-later AND CC0-1.0 AND BSD-3-Clause AND (LGPL-2.1-only OR SISSL) AND (MPL-2.0 OR LGPL-3.0-or-later) AND (MPL-2.0 OR LGPL-2.1-or-later) AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-only) AND MIT URL: http://www.libreoffice.org/ Source0: %{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz @@ -105,6 +110,7 @@ Source11: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi # with system provided hsqldb without major hacking. Source12: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source13: %{external_url}/../extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf +Source14: %{external_url}/Java-WebSocket-1.5.4.tar.gz %global bundling_options %{?bundling_options} --without-system-hsqldb Provides: bundled(hsqldb) = 1.8.0 @@ -182,6 +188,7 @@ BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libabw-0.1) +BuildRequires: pkgconfig(libargon2) BuildRequires: pkgconfig(libcdr-0.1) BuildRequires: pkgconfig(libclucene-core) BuildRequires: pkgconfig(libcmis-0.6) @@ -246,6 +253,7 @@ BuildRequires: pkgconfig(mdds-2.1) BuildRequires: pkgconfig(zxing) BuildRequires: libnumbertext-devel BuildRequires: frozen-static +BuildRequires: zxcvbn-c-devel %ifarch %{java_arches} # java stuff @@ -288,10 +296,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-default-to-sifr-for-gnome-light-mode.patch # backported -Patch4: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch -Patch5: limit-tests-giving-dubious-results-to-x86_64.patch -Patch6: pdfdoc.patch -Patch7: 0001-tdf-158302-fix-build-against-system-libxml-2.12.patch +Patch4: py313.patch # not upstreamed # fix FTB in ppc64le from sharkcz # https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html @@ -995,6 +1000,7 @@ Rules for auto-correcting common %{langname} typing errors. \ %autocorr -l sl -n Slovenian %autocorr -l sr -n Serbian %autocorr -l sv -n Swedish +%autocorr -l th -n Thai %autocorr -l tr -n Turkish %autocorr -l vi -n Vietnamese %autocorr -l vro -n Võro @@ -1033,11 +1039,11 @@ mv -f redhat.soc extras/source/palettes/standard.soc # apply patches %autopatch -p1 -M 99 %if 0%{?rhel} -%patch500 -p1 +%patch -P 500 -p1 %endif %ifarch aarch64 s390x ppc64le -%patch501 -p1 +%patch -P 501 -p1 %endif # Temporarily disable failing tests @@ -1057,6 +1063,12 @@ sed -i -e s/CppunitTest_basic_macros// basic/Module_basic.mk # Other test exclusions pointed out by sharkcz sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk sed -i -e /CppunitTest_sw_core_layout/d sw/Module_sw.mk +# https://bugs.documentfoundation.org/show_bug.cgi?id=158722 +sed -i -e /CppunitTest_desktop_lib/d desktop/Module_desktop.mk +# https://bugs.documentfoundation.org/show_bug.cgi?id=159184 +sed -i -e /CppunitTest_vcl_png_test/d vcl/Module_vcl.mk +# https://bugs.documentfoundation.org/show_bug.cgi?id=159211 +sed -i -e /CppunitTest_sd_png_export_tests/d sd/Module_sd.mk %endif #see rhbz#2072615 @@ -1078,8 +1090,8 @@ done ARCH_FLAGS="$ARCH_FLAGS -g1" %endif export ARCH_FLAGS -export CFLAGS=$ARCH_FLAGS -export CXXFLAGS=$ARCH_FLAGS +export CFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn" +export CXXFLAGS="$ARCH_FLAGS -I%{_includedir}/zxcvbn" %if 0%{?rhel} %define distrooptions --disable-eot --disable-firebird-sdbc @@ -1145,7 +1157,8 @@ touch autogen.lastrun %{distrooptions} \ %{?bundling_options} \ %{?archoptions} \ - %{?flatpakoptions} + %{?flatpakoptions} \ + --with-system-zxcvbn if ! %make_build; then echo "build attempt 1 failed" @@ -1560,7 +1573,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libdeployment.so %{baseinstdir}/program/libdeploymentgui.so %{baseinstdir}/program/libdlgprovlo.so -#%%{baseinstdir}/program/libexpwraplo.so %{baseinstdir}/program/libfps_officelo.so %{baseinstdir}/program/gdbtrace %{baseinstdir}/program/gengal @@ -1584,7 +1596,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libdbahsqllo.so %{baseinstdir}/program/libdbaselo.so %{baseinstdir}/program/libdbaxmllo.so -#{baseinstdir}/program/libdbmmlo.so %{baseinstdir}/program/libdbpool2.so %{baseinstdir}/program/libdbtoolslo.so %{baseinstdir}/program/libdbulo.so @@ -1657,7 +1668,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/libucbhelper.so %{baseinstdir}/program/libucpchelp1.so %{baseinstdir}/program/libucpdav1.so -%{baseinstdir}/program/libucpftp1.so %{baseinstdir}/program/libucphier1.so %{baseinstdir}/program/libucppkg1.so %{baseinstdir}/program/libunordflo.so @@ -1751,7 +1761,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/share/config/soffice.cfg/modules %{baseinstdir}/share/config/soffice.cfg/*/ui %{baseinstdir}/share/palette -%{baseinstdir}/share/config/webcast %{baseinstdir}/share/config/wizard %dir %{baseinstdir}/share/dtd %{baseinstdir}/share/dtd/officedocument @@ -1780,7 +1789,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/share/template/common/presnt %{baseinstdir}/share/template/common/styles %{baseinstdir}/share/template/common/wizard -%dir %{baseinstdir}/share/template/common/l10n +%{baseinstdir}/share/template/common/l10n/ %{baseinstdir}/share/template/wizard %dir %{baseinstdir}/share/wordbook %{baseinstdir}/share/wordbook/en-GB.dic @@ -2034,7 +2043,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/impress.abignore %endif %{baseinstdir}/program/libPresentationMinimizerlo.so -#%%{baseinstdir}/program/libPresenterScreenlo.so %{baseinstdir}/program/libwpftimpresslo.so %dir %{baseinstdir}/share/config/soffice.cfg/simpress %{baseinstdir}/share/config/soffice.cfg/simpress/effects.xml @@ -2099,6 +2107,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{baseinstdir}/program/classes/libreoffice.jar %{baseinstdir}/program/classes/ridl.jar %{baseinstdir}/program/classes/unoloader.jar +%{baseinstdir}/program/classes/java_websocket.jar %{baseinstdir}/program/javaldx %{baseinstdir}/program/javavendors.xml %{baseinstdir}/program/jvmfwk3rc @@ -2194,7 +2203,6 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %{libo_python_sitearch}/__pycache__/uno.cpython-* %{libo_python_sitearch}/__pycache__/unohelper.cpython-* %{libo_python_sitearch}/__pycache__/officehelper.cpython-* -%{baseinstdir}/share/registry/pyuno.xcd %files librelogo %{baseinstdir}/share/registry/librelogo.xcd @@ -2274,6 +2282,19 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +## START: Generated by rpmautospec +* Thu Jan 25 2024 Fedora Release Engineering - 1:24.2.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Gwyn Ciesla - 1:24.2.0.2-3 +- Re-enable LTO for non-s390x arches + +* Wed Jan 17 2024 Gwyn Ciesla - 1:24.2.0.2-2 +- Temporarily disable LTO due to gcc14 bug + +* Wed Jan 17 2024 Gwyn Ciesla - 1:24.2.0.2-1 +- 24.2.0.2 + * Fri Dec 08 2023 Gwyn Ciesla - 1:7.6.4.1-1 - 7.6.4.1 @@ -5050,3 +5071,4 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : * Wed Sep 29 2010 Caolán McNamara 3.2.99.1-1 - initial import of the leviathan +## END: Generated by rpmautospec From 1917fdcb4d5423d7e39b10f1b7f9c1ddedacbcd0 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Thu, 22 Feb 2024 01:47:07 -0600 Subject: [PATCH 3/3] El __pycache__ ya no se borra --- CentOS-9/SPECS/libreoffice.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CentOS-9/SPECS/libreoffice.spec b/CentOS-9/SPECS/libreoffice.spec index 1dfdc48..2a2a7d8 100644 --- a/CentOS-9/SPECS/libreoffice.spec +++ b/CentOS-9/SPECS/libreoffice.spec @@ -1576,7 +1576,7 @@ rm -f %{buildroot}%{baseinstdir}/program/officebean.abignore # Clean other ppyhon 3.9 pycache in CentOS 9 # rm -rf /home/sandino/rpmbuild/BUILDROOT/libreoffice-7.3.1.3-4.el9.x86_64/usr/lib64/python3.9/site-packages/__pycache__ -rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__ +#rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__ %check @@ -1586,7 +1586,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar # Clean other ppyhon 3.9 pycache in CentOS 9 # rm -rf /home/sandino/rpmbuild/BUILDROOT/libreoffice-7.3.1.3-4.el9.x86_64/usr/lib64/python3.9/site-packages/__pycache__ -rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__ +#rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__ @@ -2338,6 +2338,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Wed Feb 21 2024 Sandino Araico Sánchez - 1:24.2.0.2-6 - Backport de 24.2.0.2 para CentOS 9 +- El __pycache__ ya no se borra * Thu Jan 25 2024 Fedora Release Engineering - 1:24.2.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild