From b3c2c7ff147ef4e6745049d380762497735e2593 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 21 Dec 2020 07:13:56 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libreoffice.git#1d4a89993968dc233d2563b2a18ec5f5836cfe58 --- .gitignore | 13 +++++++------ libreoffice.spec | 16 +++++++++++++--- sources | 13 +++++++------ 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 41becd4..55b1d41 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,10 @@ /884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz -/libreoffice-7.0.4.1.tar.xz -/libreoffice-7.0.4.1.tar.xz.asc -/libreoffice-help-7.0.4.1.tar.xz -/libreoffice-help-7.0.4.1.tar.xz.asc -/libreoffice-translations-7.0.4.1.tar.xz -/libreoffice-translations-7.0.4.1.tar.xz.asc +/libreoffice-7.0.4.2.tar.xz +/libreoffice-7.0.4.2.tar.xz.asc +/libreoffice-help-7.0.4.2.tar.xz +/libreoffice-help-7.0.4.2.tar.xz.asc +/libreoffice-translations-7.0.4.2.tar.xz +/libreoffice-translations-7.0.4.2.tar.xz.asc +/libreoffice-7.0.4.2-1.fc34.src.rpm diff --git a/libreoffice.spec b/libreoffice.spec index 9cc6ddd..b0771aa 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,8 +49,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.1 -Release: 1%{?libo_prerelease}%{?dist} +Version: %{libo_version}.2 +Release: 2%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -1022,6 +1022,7 @@ sed -i -e /CppunitTest_services/d postprocess/Module_postprocess.mk # i686 sed -i -e /CppunitTest_sd_export_ooxml2/d sd/Module_sd.mk # i686 sed -i -e /CppunitTest_sw_ooxmlexport4/d sw/Module_sw.mk sed -i -e /CppunitTest_xmlsecurity_signing/d xmlsecurity/Module_xmlsecurity.mk +sed -i -e /CppunitTest_xmlsecurity_pdfsigning/d xmlsecurity/Module_xmlsecurity.mk %if 0%{?rhel} sed -i -e /CppunitTest_desktop_lib/d desktop/Module_desktop.mk sed -i -e s/CppunitTest_editeng_core// editeng/Module_editeng.mk @@ -1083,7 +1084,10 @@ SMP_MFLAGS=%{?_smp_mflags} SMP_MFLAGS=$[${SMP_MFLAGS/-j/}] %if 0%{?flatpak} -%define flatpakoptions --with-boost-libdir=%{_libdir} --with-beanshell-jar=/app/share/java/bsh.jar --with-commons-logging-jar=/app/share/java/commons-logging.jar --with-flute-jar=/app/share/java/flute.jar --with-jfreereport-jar=/app/share/java/flow-engine.jar --with-libbase-jar=/app/share/java/libbase.jar --with-libfonts-jar=/app/share/java/libfonts.jar --with-libformula-jar=/app/share/java/libformula.jar --with-liblayout-jar=/app/share/java/liblayout.jar --with-libloader-jar=/app/share/java/libloader.jar --with-librepository-jar=/app/share/java/librepository.jar --with-libserializer-jar=/app/share/java/libserializer.jar --with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir} +%global flatpakoptions --with-beanshell-jar=/app/share/java/bsh.jar --with-commons-logging-jar=/app/share/java/commons-logging.jar --with-flute-jar=/app/share/java/flute.jar --with-jfreereport-jar=/app/share/java/flow-engine.jar --with-libbase-jar=/app/share/java/libbase.jar --with-libfonts-jar=/app/share/java/libfonts.jar --with-libformula-jar=/app/share/java/libformula.jar --with-liblayout-jar=/app/share/java/liblayout.jar --with-libloader-jar=/app/share/java/libloader.jar --with-librepository-jar=/app/share/java/librepository.jar --with-libserializer-jar=/app/share/java/libserializer.jar --with-libxml-jar=/app/share/java/libxml.jar --with-sac-jar=/app/share/java/sac.jar FIREBIRDCONFIG=%{_libdir}/fb_config QT4INC=%{_includedir} +%if 0%{?rhel} +%global flatpakoptions %{flatpakoptions} --with-boost-libdir=%{_libdir} +%endif %endif # TODO: enable coinmp? @@ -2269,6 +2273,12 @@ done %{_includedir}/LibreOfficeKit %changelog +* Sun Dec 20 2020 Caolán McNamara - 1:7.0.4.2-2 +- workaround for make check failure + +* Wed Dec 09 2020 Caolán McNamara - 1:7.0.4.2-1 +- latest version + * Wed Dec 02 2020 Thierry Vignaud 1:7.0.4.1-1 - Update to 7.0.4 RC1 diff --git a/sources b/sources index f6e60fe..18df01c 100644 --- a/sources +++ b/sources @@ -7,9 +7,10 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838d SHA512 (884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf) = ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.0.4.1.tar.xz) = 0ed133b25862e216f59ae69dd977e7501f41e1d1a0d2bb012447982ce5b4b68a7413b1a6f610f1c4f2aea3d19609a7a3fac23870f0b8162edf7c65b8fe5bcc54 -SHA512 (libreoffice-7.0.4.1.tar.xz.asc) = 77cad553e5dbccf6bf82c9942c79d8f3e9e091aa3cd8348a0114faaa5ec08fa38f857e095132a9e31f87a7f7729d295caa46c1057ca565179dd1c69e945f6d38 -SHA512 (libreoffice-help-7.0.4.1.tar.xz) = 258db0291bcf4b082546b1705a40a8aa8dba6e27a52939163d449d95d8b358be074fd541aefbb60b9f718c67f448809def7d62f3198f3e40258621153b8a6723 -SHA512 (libreoffice-help-7.0.4.1.tar.xz.asc) = acfcff7e4b74d4e54faaea74a0d6dd63c52914ab3b551cc594bfbe1e04095cdd706bf3a1d255c444f70b6177063bba7bdd8db8dd3654439f20e971d91f53bc90 -SHA512 (libreoffice-translations-7.0.4.1.tar.xz) = f61acfbe50cefbcf2edeb564df9bc05eeb4e52601052ff3cae7295d1e2c0da6f29072b05cbfca92e60829f4fd92bac8f8a7353399c38c8fc068acd78e56fec6a -SHA512 (libreoffice-translations-7.0.4.1.tar.xz.asc) = 424e91977933d05c3fcef9399e0413dec21d07956832b2f9c5c2542b828d080221e2dce3d16d1a62855292801ec9f8f6b465f97fb64cdc265935a35d09ebbe7e +SHA512 (libreoffice-7.0.4.2.tar.xz.asc) = 2e3131b96bc382d773af17f0885ee047525928e7dbe939103b89e7f4f9bc541843bf8ad93317eb36fb4bb26a313b3ef3b0a3e04499b6e1e19e930a667c2370ab +SHA512 (libreoffice-help-7.0.4.2.tar.xz.asc) = df75f4261657fa32988621401daa1cad946740b535fbc9ddaea3134f9d02d919261c96641d295c99e3b66443b9f13ec15577122649adcb91d57c4bbcb8e16996 +SHA512 (libreoffice-translations-7.0.4.2.tar.xz.asc) = 648550fbcb9c3c8f185653ccf02d30b722a5369d170e14686ac11f124437a541bf5851b56b807c90ca2a21d17b5888b40757e8c6f65309aab65d35ccdcd0feff +SHA512 (libreoffice-7.0.4.2.tar.xz) = cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b +SHA512 (libreoffice-help-7.0.4.2.tar.xz) = ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe +SHA512 (libreoffice-7.0.4.2-1.fc34.src.rpm) = 2e352a68fa96a02a44b00ce905714c7cb72f2b15c05f1af9fd8f4cf5890a1404ca772cfbb098e3a97b8a42c5f70c29db659c24bc664137ccd9acbdce74b39125 +SHA512 (libreoffice-translations-7.0.4.2.tar.xz) = a1da20b4e4ae4952ca619871fc74c5693202e1f909f16ca1321a46dbc9abf979239c989bc56799c3e0c1f0930e8a41bd9aca2212bf5435e733951bdef8a5315c