diff --git a/libreoffice-7.6.4.1-icu-74.2.patch b/libreoffice-24.2.3.2-icu-74.2.patch similarity index 100% rename from libreoffice-7.6.4.1-icu-74.2.patch rename to libreoffice-24.2.3.2-icu-74.2.patch diff --git a/libreoffice-24.2.4.2-icu-75.1.patch b/libreoffice-24.2.4.2-icu-75.1.patch new file mode 100644 index 0000000..7d92e9f --- /dev/null +++ b/libreoffice-24.2.4.2-icu-75.1.patch @@ -0,0 +1,10 @@ +--- libreoffice-24.2.4.2/i18npool/source/breakiterator/data/sent.txt.orig 2024-06-13 17:14:49.079861742 +0200 ++++ libreoffice-24.2.4.2/i18npool/source/breakiterator/data/sent.txt 2024-06-13 17:14:56.564879006 +0200 +@@ -106,7 +106,6 @@ + # builder. Needs more investigation. + # + +-[{bof}] (.? | $LF $CR) [^$Sep]* [$Sep {eof}] ($SpEx_R* $CloseEx_R* ($STermEx_R | $ATermEx_R))*; + #.*; + + # Explanation for this rule: diff --git a/libreoffice.spec b/libreoffice.spec index 12d4770..f583500 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -19,7 +19,7 @@ %define langpacks 1 Name: libreoffice -Version: 24.2.2.2 +Version: 24.2.4.2 Release: 1mamba Summary: Free Office Suite Group: Graphical Desktop/Applications/Office @@ -52,12 +52,13 @@ Source37: https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698 Source38: https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz Source39: https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz Source40: https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz -Patch0: libreoffice-7.6.4.1-icu-74.2.patch +Patch0: libreoffice-24.2.3.2-icu-74.2.patch +Patch1: libreoffice-24.2.4.2-icu-75.1.patch License: BSD, Common Development and Distribution License 1.0, GPL, LGPL, MPL 1.1, Netscape, Public Domain ## AUTOBUILDREQ-BEGIN BuildRequires: firebird-devel BuildRequires: glibc-devel -BuildRequires: java-openjdk11-runtime +BuildRequires: java-openjdk17-runtime BuildRequires: libICE-devel BuildRequires: libQt5X11Extras-devel BuildRequires: libSM-devel @@ -70,13 +71,14 @@ BuildRequires: libabseil-cpp-devel BuildRequires: libabw-devel BuildRequires: libargon2-devel BuildRequires: libat-spi2-core-devel -BuildRequires: libblas-devel +BuildRequires: libatlas-devel BuildRequires: libboost-devel BuildRequires: libbox2d-devel BuildRequires: libbzip2-devel BuildRequires: libcairo-devel BuildRequires: libcdr-devel BuildRequires: libclucene-devel +BuildRequires: libcmis-devel BuildRequires: libcoinmp-devel BuildRequires: libcups-devel BuildRequires: libcurl-devel @@ -107,7 +109,6 @@ BuildRequires: libhyphen-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: liblangtag-devel -BuildRequires: liblapack-devel BuildRequires: liblcms2-devel BuildRequires: liblp_solve-devel BuildRequires: libltdl-devel @@ -514,8 +515,8 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro %setup -q -b 2 -b 3 -b4 -a5 #% setup -q -c -T -D #:<< ____EOF - %patch 0 -p1 -b .icu-74.2 +%patch 1 -p1 touch scripting/source/pyprov/delzip #touch scripting/util/provider/beanshell/delzip @@ -615,7 +616,7 @@ sed -i "s|moc-qt6|moc|" configure --with-system-openssl \ --with-system-graphite \ --without-system-zxcvbn \ - --without-system-libcmis \ + --with-system-libcmis \ --enable-split-app-modules \ --enable-split-opt-features @@ -992,6 +993,9 @@ This package contains %{langname} translations and resources for LibreOffice.\ %langpack -l zu -n Zulu -F -H -Y %changelog +* Thu Jun 20 2024 Automatic Build System 24.2.4.2-1mamba +- automatic version update by autodist + * Fri Apr 05 2024 Automatic Build System 24.2.2.2-1mamba - automatic version update by autodist