From 14eb221cf8c7fa4a7aff41a3ee00b09a0bfffe47 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 05:34:49 +0100 Subject: [PATCH] update to 6.3.2.2 [release 6.3.2.2-1mamba;Thu Oct 03 2019] --- ...f058eca79acbf3ee784f6630704cc-opens___.ttf | Bin 207400 -> 207544 bytes libreoffice.spec | 75 ++++++++++++------ 2 files changed, 50 insertions(+), 25 deletions(-) rename 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf => 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf (98%) diff --git a/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf b/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf similarity index 98% rename from 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf rename to 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf index 5a10feb2b8da1349027a681845ecd8b0bc6b8937..46d9578e4d59aeed87aa0f04c1678b202bb90155 100644 GIT binary patch delta 903 zcmY*XO-NKx7(Msh_h!aPozW&W7@ap1>7>jbmRJ&Kra`4rCM|+|j!$RMnRz%Gwg{!7 zT9i~1&ZZVwkc)_9iiv`L7J&pt#zeUZ7X=Y5!hVoQ?R)wbb>ZH7&iTIk-H&tcWH$HV z+uRW_0CrkLpsA_-z`(`02EO$gsm|ucJx${G96Rww;vKDre8ILSUw;AYJn_y@RM9-H zouxow7_izy#|P!SvErkE%TDpO9<4WOyYIVArG^1P?Nt)m$_hButE0H3xBtXQ&!_5T z3*h?*Va6X;m2Nc8RMG{xl(0QaLf(>fFLAwr&Ee?aa6{jQr^G)~*Q5RMkYaMRj?#sl z#Lq;PVNL25i8E>la!iS;KaSM@fw1HNOqaBHV(|LoQ#-)hxoE2@(7xTw#bwA;v-e^4QF39Nnoc(Z5($8wlvYsi*$rvkTlj#fWz1=Iy=%N&E zOy_DXSWKko9y=kLzffZnM9i2-juonGHoZ`IlhJn7af7jzbal~gW+Us_GpPeAu}sz{6wHh;bV+Ve zFqP}iy?&d!oOKENJ?y09*2b5A>vi&Rcdc={V2XDen87Ml8CZZ>YBn$@T{W;s_^g2? z*rX`~n@E4Bn;_=2kUeW25uva{Dq0IbK)zICU`~3gfkndfAN9kKP$peAu!;2NnJY_z zhu2y$gcu?S!jDD-Afo~ycxcy^0BQ-fLqQ)@BoL-d8TIs5>VrpooRwOKVv(S~F(6lj zJaW(OdkAkI4al&>INIdSp||&AH6vOate;EP|NH ijIQHVWmdCM5=h!xJV6jv~P=x&ov(K#tGs*J9erqUH9L81K23>1Btw*8|CZ0 zfG-I+9f?DQaP3L|ULZu-(3RFRdC!D;g;J46N@cV`eSRLC^4*}gBh!0$I6Yn{od?t^ zq$zJUr6qrz%DtrmW&`W9B-GA1JBYUvZ^-5gLv5YQ_7NwK_egJlLbC;qby2}?;v;!& zNS700gyLE9hx@dAs%K_n8q)6>z_v;6A1t)p`>-3Fhk-R?`anxczx8RI0tBmcpm|{$ z>G})7m92O8ds@FD1TZW~dy!5%W5B4qTj73^AhjJ@ziD9o)DSjYqW zA5zTu1|aNjsHqYWJ4(hGU#k4WH_pnJloBg%S-zEdE>d`sJs~sLQ}*0=?XPQQlcq@P zF?+TUpq;&^Nd`>z|0B5!t*)so>R$Sf&#EV8RaTi*CC}6_;Kt3xe(3aB9n$uJC~vl~jr4<+M{`mmudHVL94p2+Use1m@xsz5!u0>81_pEeec@QNr8yQY9_75j wO{Jy9LCj~M7^nS;Btn%*&f6Rnn~OIEi>(pf$%4hv2oEULch($ diff --git a/libreoffice.spec b/libreoffice.spec index 506a91d..de8de49 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,7 +28,7 @@ %define langpacks 1 Name: libreoffice -Version: 6.2.3.2 +Version: 6.3.2.2 Release: 1mamba Summary: Free Office Suite Group: Graphical Desktop/Applications/Office @@ -53,10 +53,10 @@ Source28: http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af. Source29: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source30: http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2 Source31: http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -Source32: http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2 +Source32: http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2 Source33: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar Source34: https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar -Source35: https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf +Source35: https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf Patch12: libreoffice-installfix.patch Patch39: libreoffice-5.1.1.1-gcc-5.3-std-isnan.patch Patch40: libreoffice-5.1.3.2-x86-cppunit.patch @@ -267,15 +267,15 @@ BuildRequires: jakarta-commons-httpclient == 3.1 BuildRequires: jakarta-commons-lang == 2.3 BuildRequires: jakarta-commons-logging == 1.1.1 %if %with_system_hsqldb -BuildRequires: java-hsqldb == 1.8.0.10 +BuildRequires: java-hsqldb1 < 1.8.1 %endif -BuildRequires: java-bsh2 == 2.0b4 +BuildRequires: java-bsh2 >= 2.0b4 BuildRequires: java-lucene BuildRequires: java-lucene-contrib #BuildRequires: java-junit48 BuildRequires: postgresql-jdbc %if %with_system_saxon9 -BuildRequires: java-saxon9 == 9.1.0.7 +BuildRequires: java-saxon9 >= 9.1.0.7 %endif BuildRequires: java-pentaho-reporting-flow-engine # for the KDE subpackage @@ -341,6 +341,8 @@ Requires: libgtk # < 3.3.1 Provides: %{name}-graphicfilter Obsoletes: %{name}-graphicfilter +Provides: %{name}-kde +Obsoletes: %{name}-kde Provides: OpenOffice-common Obsoletes: OpenOffice-common @@ -364,7 +366,7 @@ Python bindings for the LibreOffice UNO component model. Allows scripts both ext Summary: Database front-end for LibreOffice Group: Graphical Desktop/Applications/Office %if %with_system_hsqldb -Requires: java-hsqldb == 1.8.0.10 +Requires: java-hsqldb1 < 1.8.1 %endif Requires: postgresql-jdbc #Requires: %{name}-ure = %{version}-%{release} @@ -671,8 +673,10 @@ Requires: %{name}-core = %{version}-%{release} %description gnome A plug-in for LibreOffice that enables integration into the GNOME desktop environment. +%debug_package + %prep -#% setup -q -b 2 -b 3 -b4 -a5 +#%setup -q -b 2 -b 3 -b4 -a5 %setup -q -c -T -D :<< ____EOF @@ -684,9 +688,9 @@ A plug-in for LibreOffice that enables integration into the GNOME desktop enviro #mv translations src %patch12 -p1 -b .libreoffice-installfix.patch -%patch41 -p1 -%patch42 -p1 -#%patch43 -p1 +#%patch41 -p1 +#%patch42 -p1 +##%patch43 -p1 touch scripting/source/pyprov/delzip #touch scripting/util/provider/beanshell/delzip @@ -740,6 +744,7 @@ sed -i -e "\ /CppunitTest_sw_ooxmlexport7/d;\ /CppunitTest_sw_ooxmlexport11/d;\ /CppunitTest_sw_odfexport/d;\ +/CppunitTest_sw_rtfexport5/d;\ /CppunitTest_sw_uiwriter/d;\ /CppunitTest_tools_test/d;\ /CppunitTest_xmlsecurity_signing/d;\ @@ -750,11 +755,8 @@ sed -i -e "\ %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` -export QT4DIR=%{_qt4_prefix} -export KDE4DIR=%{_kde4_prefix} -export PATH=$QT4DIR/bin:$PATH export JAVA_HOME=%{java_home} -#:<< ___EOF +:<< ___EOF #./autogen.sh @@ -781,7 +783,7 @@ export JAVA_HOME=%{java_home} --with-system-mdds \ %if %with_system_hsqldb --with-system-hsqldb \ - --with-hsqldb-jar=$(build-classpath hsqldb) \ + --with-hsqldb-jar=$(build-classpath hsqldb-1.8.0.10) \ %else --without-system-hsqldb \ %endif @@ -794,7 +796,7 @@ export JAVA_HOME=%{java_home} --with-system-libwpd \ --with-system-libwpg \ --with-system-libwps \ - --enable-kde4 \ + --enable-kde5 \ PYTHON=%{__python3} \ --with-system-boost \ --with-system-cairo \ @@ -806,7 +808,6 @@ export JAVA_HOME=%{java_home} --with-system-redland \ --with-system-zlib \ --with-system-openssl \ - --with-system-mysql-cppconn \ --with-system-graphite \ --enable-gtk \ --enable-split-app-modules \ @@ -823,7 +824,7 @@ export JAVA_HOME=%{java_home} # --with-intro-progressbar-position=60,316 \ # --with-intro-progressbar-size=409,8 \ -#___EOF +___EOF for i in $RPM_OPT_FLAGS; do case "$i" in @@ -833,7 +834,16 @@ for i in $RPM_OPT_FLAGS; do done export ARCH_FLAGS +count=0 +set +e +while [[ count -lt 3 ]]; do +# Workaround for java random crashes on build servers +count=$((count+1)) %make +[ $? -eq 0 ] && break +done +[ $? -ne 0 ] && exit 1 +set -e make -C cli_ure #make -C unoil @@ -857,7 +867,7 @@ echo build end time is `date`, diskspace: `df -h . | tail -n 1` # Workaround for: ERROR: Include file cliuhttp://www.lastampa.it/reversion.mk not found! make distro-pack-install DESTDIR=%{buildroot} -sed -i "s|\[|*|;s|\]|*|" file-lists/sdk_doc_list.txt +#sed -i "s|\[|*|;s|\]|*|" file-lists/sdk_doc_list.txt sed -i "s|%{_libdir}/libreoffice/help/bn-IN.*||" file-lists/lang_bn_IN_list.txt # NOTE: if the following installation error occurs: @@ -1001,6 +1011,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %files core -f file-lists/common_list.txt %defattr(-,root,root) +%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml +%{_libdir}/libreoffice/program/libkde5be1lo.so +%{_libdir}/libreoffice/program/libvclplug_kde5lo.so +%{_libdir}/libreoffice/program/libvclplug_qt5lo.so %files base -f file-lists/base_list.txt %defattr(-,root,root) @@ -1031,10 +1045,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %files gnome -f file-lists/gnome_list.txt %defattr(-,root,root) -%files kde -f file-lists/kde4_list.txt -%defattr(-,root,root) -%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml - %files mailmerge -f file-lists/mailmerge_list.txt %defattr(-,root,root) @@ -1053,7 +1063,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : #%files presentation-minimizer -f file-lists/orig/gid_Module_Optional_Extensions_MINIMIZER #%defattr(-,root,root) -%files postgresql -f file-lists/orig/gid_Module_Optional_PostgresqlSdbc +%files postgresql -f file-lists/postgresql_list.txt %defattr(-,root,root) #%files pdfimport -f file-lists/orig/gid_Module_Optional_Extensions_PDFIMPORT @@ -2528,6 +2538,18 @@ This package contains additional Swahili (Tanzania) translations and resources f %files i18n-sw_TZ -f file-lists/lang_sw_TZ_list.txt %defattr(-,root,root) +%package i18n-szl +Summary: Swaziland language support for LibreOffice +Group: System/Internationalization +Requires: %{name}-core = %{version}-%{release} +Provides: libreofficei18n + +%description i18n-szl +This package contains additional Swaziland translations and resources for LibreOffice. + +%files i18n-szl -f file-lists/lang_szl_list.txt +%defattr(-,root,root) + %package i18n-ta Summary: Tamil language support for LibreOffice Group: System/Internationalization @@ -2798,6 +2820,9 @@ This package contains additional Zulu translations and resources for LibreOffice %endif %changelog +* Thu Oct 03 2019 Silvan Calarco 6.3.2.2-1mamba +- update to 6.3.2.2 + * Fri Apr 26 2019 Silvan Calarco 6.2.3.2-1mamba - update to 6.2.3.2