diff --git a/.gitignore b/.gitignore index b8793d5..b923ebb 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,9 @@ /libreoffice-help-7.6.1.2.tar.xz.asc /libreoffice-translations-7.6.1.2.tar.xz /libreoffice-translations-7.6.1.2.tar.xz.asc +/libreoffice-7.6.2.1.tar.xz +/libreoffice-7.6.2.1.tar.xz.asc +/libreoffice-help-7.6.2.1.tar.xz +/libreoffice-help-7.6.2.1.tar.xz.asc +/libreoffice-translations-7.6.2.1.tar.xz +/libreoffice-translations-7.6.2.1.tar.xz.asc diff --git a/libreoffice.spec b/libreoffice.spec index ba34747..d6c45dd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.6.1 +%global libo_version 7.6.2 # 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. @@ -57,7 +57,7 @@ ExcludeArch: %{ix86} Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.1 Release: 1%{?libo_prerelease}%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 @@ -273,6 +273,7 @@ Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch # backported Patch5: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch +Patch6: limit-tests-giving-dubious-results-to-x86_64.patch # not upstreamed # fix FTB in ppc64le from sharkcz # https://lists.freedesktop.org/archives/libreoffice/2023-August/090870.html @@ -2257,6 +2258,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Sat Sep 30 2023 Mattia Verga - 1:7.6.2.1-1 +- 7.6.2.1 + * Fri Sep 08 2023 Gwyn Ciesla - 1:7.6.1.2-1 - 7.6.1.2 diff --git a/limit-tests-giving-dubious-results-to-x86_64.patch b/limit-tests-giving-dubious-results-to-x86_64.patch new file mode 100644 index 0000000..f68ecad --- /dev/null +++ b/limit-tests-giving-dubious-results-to-x86_64.patch @@ -0,0 +1,32 @@ +From 3426c96d0e32e0c83e4ce5fdb3405787a0c81e6c Mon Sep 17 00:00:00 2001 +From: Dan Horák +Date: Fri, 01 Sep 2023 18:45:42 +0200 +Subject: [PATCH] limit tests giving dubious results to x86_64 + +We have confirmed that ArrayFunctionsTest::testDubiousArrayFormulasFODS +gives different results depending on the -ffp-contract setting on +ppc64le and likely also on s390x in addition to aarch64. Thus limit the +check only to x86_64 where it's known to give consistent results. + +Change-Id: Iedb63fb4340cfe9a88e374c7498d97574bcdfcc7 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156453 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann +--- + +diff --git a/sc/qa/unit/functions_array.cxx b/sc/qa/unit/functions_array.cxx +index 7584c4e..2053c44 100644 +--- a/sc/qa/unit/functions_array.cxx ++++ b/sc/qa/unit/functions_array.cxx +@@ -27,8 +27,9 @@ + { + //TODO: sc/qa/unit/data/functions/array/dubious/fods/linest.fods produces widely different + // values when built with -ffp-contract enabled (-ffp-contract=on default on Clang 14, +- // -ffp-contract=fast default when building with optimizations on GCC) on at least aarch64: +-#if !((defined __clang__ || defined __GNUC__) && defined __aarch64__) ++ // -ffp-contract=fast default when building with optimizations on GCC) on at least aarch64 ++ // and ppc64le. Thus limit the check only to platforms with consistent results. ++#if defined X86_64 + OUString aDirectoryURL + = m_directories.getURLFromSrc(u"/sc/qa/unit/data/functions/array/dubious/fods/"); + recursiveScan(test::pass, "OpenDocument Spreadsheet Flat XML", aDirectoryURL, diff --git a/sources b/sources index 05db5fa..9a74a16 100644 --- a/sources +++ b/sources @@ -1,12 +1,12 @@ -SHA512 (libreoffice-7.6.1.2.tar.xz) = e7bd1702ec4a893b91981d02bf813609be8f4a2991114a2c550dbedb11e249c23a753c369bba182691e3985253b6b1c9073102d806dd2d7f90a6ab6ad28aa17a -SHA512 (libreoffice-7.6.1.2.tar.xz.asc) = 35ad56be21fe508fa246fdbea97338f32ace483b4d172959f2d48c7091bc1504076c25a43ec88fca81383ff38e739683f03073b622bc41ff74872760efdb0b4b -SHA512 (libreoffice-help-7.6.1.2.tar.xz) = f0ce03b98385cf012a4f4e57651e6bb8fbe306c39108bab2c72c34e80b77f5d76c61cbf329658a6b82034c0315d8c67d27a8fc76d883574dd134a515b7695492 -SHA512 (libreoffice-help-7.6.1.2.tar.xz.asc) = beea8538e1ea3c5fc41165eec472c6be58a127be0ce1fd8a5e24ead86f3ce85a786b09fb67edb10237b632731d6697796c2ecfb733e58bba03f39e76d3a57914 -SHA512 (libreoffice-translations-7.6.1.2.tar.xz) = 7fb49db5c31d79d7b51ee8e5f7270006a02036df6c9586001c9466a3eb9634e60804ed61703bca93bf0095b5637957572f72ea4d9f4dde0c7d5f5015f939a865 -SHA512 (libreoffice-translations-7.6.1.2.tar.xz.asc) = 48bb16b56a7f114d543fafed6df4904d67459add8284a88e3b76ec8d28d55d78730a9c972b1a9d3a03f3f453a807fe25067288be00686098359cade602a6d1f2 SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 +SHA512 (libreoffice-7.6.2.1.tar.xz) = 4b209c444437c067bbc08c5b7d0273fa32675a19afc15751a403e1ee024795fe87aecf64de193203ee4f84f5b7ae8d547cde4ed9aced4efd3d6743af65ac6896 +SHA512 (libreoffice-7.6.2.1.tar.xz.asc) = 0278e6e92971ce9d68f21056f0539c38a6a3def6269daf9263d3ed54bddd4761dea0cc2646b3dfff237a92d2bdb958339aee641651d67aa27d179f94ad26c480 +SHA512 (libreoffice-help-7.6.2.1.tar.xz) = 8fda9424a5ff5fbe0317e08d91504b75e3075d13d3f9b65aa21cdbc53578b1dda40b14168becc577b972eefb09a8255a5ce00322277714274c8adf6975f08a61 +SHA512 (libreoffice-help-7.6.2.1.tar.xz.asc) = 46a4546cbee7a7c66df3ebeda99674e5369aaae169c3ab8691d71a9ef5d59189df88084832991afd9d3928584ad83de8f060f452a1d78b2ef229e537eff5cd1d +SHA512 (libreoffice-translations-7.6.2.1.tar.xz) = 4cecbc09d648ee751ca7bbcfa61b8ec174ac71aae7255c6359af5f6cbff019cc4ad5b6b4ca757329907175b13ce57e5afaa70355a9bfc48e86f6ccf8d0b7e80d +SHA512 (libreoffice-translations-7.6.2.1.tar.xz.asc) = 936f34adf6648526db69efb968e66095430e8f5f7fbff241a64f44844dfb4eab2571e2813c39da52103054f72ebf08662b0f1c5d02a0876180dc138090ef6dfe