strepsirrhini/libreoffice-compilar
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge sandino/24.2.1.1-el9

Browse source
This commit is contained in:
Sandino Araico Sánchez 2024-02-23 18:07:47 -06:00
commit 57ac47dcd2
2 changed files with 75 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CentOS-9/SPECS/liborcus.spec
View file

@ -207,7 +207,6 @@ make check %{?_smp_mflags}
%doc doc/_doxygen/html
%changelog
## START: Generated by rpmautospec
* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 0.19.2-2
- Rebuilt for Boost 1.83

93
CentOS-9/SPECS/libreoffice.spec
View file

@ -1,6 +1,11 @@
%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.0
%global libo_version 24.2.1
# 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.
@ -53,8 +58,8 @@ ExcludeArch: %{ix86}
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
Release: 2+gob.mx%{?libo_prerelease}%{?dist}
Version: %{libo_version}.1
Release: 4+gob.mx%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@ -65,7 +70,7 @@ Release: 2+gob.mx%{?libo_prerelease}%{?dist}
# 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
@ -87,6 +92,8 @@ 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
# Fonts GMX (gob.mx)
Source21: https://repos.libreoffice.gob.mx/src/gmx-fonts.tar.gz
Source22: GMX-Acuerdo.pdf
@ -257,6 +264,7 @@ BuildRequires: pkgconfig(mdds-2.1)
BuildRequires: pkgconfig(zxing)
BuildRequires: libnumbertext-devel
BuildRequires: frozen-static
BuildRequires: zxcvbn-c-devel
%ifarch %{java_arches}
# java stuff
@ -308,10 +316,16 @@ Patch1: 0001-disble-tip-of-the-day-dialog-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
# fix FTB in ppc64le from sharkcz
# https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html
Patch11: lo-7.6-ppc64le-tests.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
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
@ -557,6 +571,7 @@ The LibreOffice Spreadsheet application.
Summary: LibreOffice Drawing Application
Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-data = %{epoch}:%{version}-%{release}
Requires: %{name}-ogltrans%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-pdfimport%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-pyuno%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-graphicfilter%{?_isa} = %{epoch}:%{version}-%{release}
@ -1532,11 +1547,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
@ -1556,6 +1571,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
%if 0%{?rhel}
@ -1616,8 +1637,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
@ -1684,7 +1705,7 @@ touch autogen.lastrun
%{?bundling_options} \
%{?archoptions} \
%{?flatpakoptions} \
--with-system-zxcvbn
if ! %make_build; then
echo "build attempt 1 failed"
@ -2069,7 +2090,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
@ -2079,7 +2100,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__
@ -2120,7 +2141,6 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2144,7 +2164,6 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2217,7 +2236,6 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2311,7 +2329,6 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2340,7 +2357,7 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2598,7 +2615,6 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2663,6 +2679,7 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2758,7 +2775,6 @@ rm -rvf %{buildroot}%{libo_python_sitearch}/__pycache__
%{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
@ -2838,9 +2854,40 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Fri Feb 23 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.1-4+gob.mx
- merge backport de 24.2.1.1
* Thu Feb 22 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.1.1-3
- Backport de 24.2.1.1 para CentOS 9
* Thu Feb 22 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.3-4
- Backport de 24.2.0.3 para CentOS 9
* Wed Feb 21 2024 Sandino Araico Sánchez <sandino@sandino.net> - 1:24.2.0.2-6
- Backport de 24.2.0.2 para CentOS 9
- El __pycache__ ya no se borra
* Wed Feb 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-2
- Draw requires oglrans
* Tue Feb 13 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.1.1-1
- 24.2.1.1
* Fri Feb 02 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.0.3-3
- Poppler rebuild
* Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 1:24.2.0.3-2
- Fix FTBFS with icu 74
* Tue Jan 30 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.0.3-1
- 24.2.0.3
* Sun Jan 28 2024 Sandino Araido Sánchez <sandino@sandino.net> - 1:24.2.0.2-2+gob.mx
- Merge 24.2.0.2-1
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:24.2.0.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 24 2024 Sandino Araico Sánchez <sandino@sandino.net> - 24.2.0.2-1
- Subida de versión
- autocorr para Thai
@ -2852,6 +2899,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
- Pruebas unitarias que fallan, temporalmente borradas
- Correcciones en la sección %files
* Thu Jan 18 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.0.2-3
- Re-enable LTO for non-s390x arches
* Wed Jan 17 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.0.2-2
- Temporarily disable LTO due to gcc14 bug
* Wed Jan 17 2024 Gwyn Ciesla <gwync@protonmail.com> - 1:24.2.0.2-1
- 24.2.0.2
* Tue Dec 12 2023 Sandino Araico Sánchez <sandino@sandino.net> - 1:7.6.4.1-2
- Backport de 7.6.4.1 para CentOS 9
@ -5738,3 +5794,4 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
* Wed Sep 29 2010 Caolán McNamara <caolanm@redhat.com> 3.2.99.1-1
- initial import of the leviathan
## END: Generated by rpmautospec