diff --git a/.gitignore b/.gitignore index 78421a1..6b149d0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip SOURCES/dtoa-20180411.tgz SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc -SOURCES/libreoffice-7.1.7.2.tar.xz -SOURCES/libreoffice-help-7.1.7.2.tar.xz -SOURCES/libreoffice-translations-7.1.7.2.tar.xz +SOURCES/libreoffice-7.1.8.1.tar.xz +SOURCES/libreoffice-help-7.1.8.1.tar.xz +SOURCES/libreoffice-translations-7.1.8.1.tar.xz diff --git a/.libreoffice.metadata b/.libreoffice.metadata index 607a381..8ff9125 100644 --- a/.libreoffice.metadata +++ b/.libreoffice.metadata @@ -4,6 +4,6 @@ 083509db5ad9d1680830be9add727d58b54ca0d3 SOURCES/dtoa-20180411.tgz dd55efd721df8a013709e27836bdf26623e5320e SOURCES/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf 7b5fd93d787fbc6d9c2d4025d543730ee8dc4559 SOURCES/gpgkey-C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3.gpg.asc -f78cb0b9fe9d264ccab701bd310c6b5cafc5310d SOURCES/libreoffice-7.1.7.2.tar.xz -1fbdfbc179ffece0b018d41ae4ba9a85abbfae42 SOURCES/libreoffice-help-7.1.7.2.tar.xz -6b3b281e626680fca62f2bddbe1c19cc8eb8225e SOURCES/libreoffice-translations-7.1.7.2.tar.xz +58642377b80001f41884b2fff3d74fe66426b182 SOURCES/libreoffice-7.1.8.1.tar.xz +48afe3a1a30861904bf31b387d6bc56360f5ac19 SOURCES/libreoffice-help-7.1.8.1.tar.xz +cb1238f7b182c8bfb16086d2eb9305b43b8a6d16 SOURCES/libreoffice-translations-7.1.8.1.tar.xz diff --git a/SOURCES/libreoffice-7.1.7.2.tar.xz.asc b/SOURCES/libreoffice-7.1.7.2.tar.xz.asc deleted file mode 100644 index 4ddfa15..0000000 --- a/SOURCES/libreoffice-7.1.7.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmF5MyoACgkQ9DSh76/u -rqNIlxAAl22pTJr3sHrwuyp9mshPRjn8IY4iTsJilYzBPvn5HArIWXA+AHlSNFO3 -l8z/+GsR/+5LU/Fa1UeVC76gx8ZH3dAr8QqNRfdQ+d9Lb89WVj5P40bcYQgm2Mo6 -XSLyZqpieSL7/Z1CFaoQp5kz3wtk4F8XphGiKFjPbND/DPZAWMZLLvRWYUUJ8qUA -sq7LiXo+rPqOUR+svMz8EcrpBxPBYK/cEu9Fcrj/ruCznIR8DmVH+TLaOWYwBy53 -QgcHZ/TTMbTWvJLH0pL6Ha7c12Yxq64EmeNNRi8uP26Cnj3Wo28RSVOxXmvcwQ7y -WDOd/e3CyVkNLyHKccrWnhaesvmlInQpjF3u7ZmCNuWI2Tj2LDBKy60HSOn/K7l9 -hhkGUHYFP4zuyepnxE+3F3elWL2lKnYgOl5cyaiO1+5JeADb2sULXpf7wtSS95P6 -F6BvILJ3Di1XTTOV7y9OcMp7xRrxEFuLxwz3J3u5g3KagtXcNMaU4aahCX1VbtFg -tgemeADXAQZqEHdUgXzRUAy8n85jgyJpRNeFw1dnQ2d8NCbPUuy94H8iHJ77jhD8 -wplVhlY4andmwz2If+SulzLzmn/fKCtnrd1Q8z7sA6N7wbbQANO6/qQQs0k2Tr6W -N/uKfCZKfLBXONG3ybdsd/le86ZPKnvaR3r0QnQlUbFXQAn3ark= -=Za4s ------END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-7.1.8.1.tar.xz.asc b/SOURCES/libreoffice-7.1.8.1.tar.xz.asc new file mode 100644 index 0000000..a2b0514 --- /dev/null +++ b/SOURCES/libreoffice-7.1.8.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGqk2oACgkQ9DSh76/u +rqPr6A//ViToQECHwnSk30IjrjyAP516Cgad9cONe+vz1bSLAo7urIAOwLSFot+T +CjRFvKIvMRt4m2pPiBQTfEAIqq4rWur4jP/5SDRz4oAdrZUNGztJp+MKeLtH3yxR +DyWbGxtr+XoC2c5wbWmL8SPSRXoZQAdnxqb/ie4Em3DVmSohCLkMeTBMxd5vagDz +jJsCv31SyGhMEkZy8TD903u9CDlwTc5heD4LL7iIX6XIozzhvywPhj8qF+8F0mj3 +KJQBhJFoWJRYjb0Vi8pnnXpE/1USzaHtcLB3jkg5SwbrC0EzDxWBsLZiAbNA6jAk +RUch2zhzXoI/hyMKEG/pw2FdcvndDtnClYnszcx/hVBlS+35ZkLSp9SklUydj2Hg +/Xed86J+BY+IOIgiMHi2Vr8CDgzK3ZTYhqiFeKGqtf8Vxf6PcpJy2OYus56nCD9j +pyLyczwRPvlsXxiWY0kPLvOE4h7zYCw+vLlwH6VSSxEsD7G+vzFS2xt9l0z6SdhX +xDZF9V08TLpcWJ8/IkUdRutoOMazghOrfL97YjUjnWOVIxAAXA1EPietDLQPdcbB ++tCOqSqXaEkrM5dvZo07p3mEZjv1KxhWqtjE3DsyqKBfHt6d5j/q61+9/87uJxNT +Rgh1MLAxbeo6E2iwp3kmOS5NLfxXkRjTIKzqnxr02nXXOMXSOo0= +=I1bc +-----END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-help-7.1.7.2.tar.xz.asc b/SOURCES/libreoffice-help-7.1.7.2.tar.xz.asc deleted file mode 100644 index ba20f80..0000000 --- a/SOURCES/libreoffice-help-7.1.7.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmF5MzAACgkQ9DSh76/u -rqPVvRAAtejhoQH4VXVAGvuCC9BRxBqmEhHUEdW2vxNZ42sX6OggTIgK5q58Uwa7 -2glVf0x+c/RxDFF68BfhiXoy4amIoJ6rFe2dLQzwfI0WmjFfSFaMCcthUnQa9giz -5U9p72apoYk2lUQEqarLthY1903DNB83bR1lUgB80mx13+xoRRCsEJ4cgltPE17c -0Ntb+sA6eETeKe8PvAK4SIApIJn/J26hZ6Qhoc74rcNpSiEtIKKChaLLB7rzmMQR -LZ6jDBMC7PmK+S/ppG8dWu0v4W+jirZhVKTDXFb90itVEAywlSUy+QgANFS8zEot -8yxH2n7Hv4ZnBCeP2nLK888al+e2V3i+H/2Jm+9NRvF8aWTDMjMmWas4VGhrkDXM -NYl37twVDY7Wq9jbw7YAht/LV7N8z0fnzaX/M5hUFnxS82+sf1/9UF8eKp4m4mCF -ir7nIQiwmtZHx1tMJhtooZA7/3C72T2ePY7i5i0Q5bWwWTOczSMfbeq4344h5Kyg -m7EaZJ4sDcAC/XCIokz3WzHQeHkYQHykCZGBFqF27vAIC1AqQqYcYg41hZE7ntMB -CHdscxlFAxcRFIBHozdCIMzi4hHnFWNjXPrMS9xhROne/EI4zTE0PPXumVlRH8ri -0yQ9egcSoyUMQ1Vgvkhhey+Dp6nLhwdVOIo8RbI4SdFE3245s7U= -=pb2q ------END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-help-7.1.8.1.tar.xz.asc b/SOURCES/libreoffice-help-7.1.8.1.tar.xz.asc new file mode 100644 index 0000000..54936b8 --- /dev/null +++ b/SOURCES/libreoffice-help-7.1.8.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGqk3AACgkQ9DSh76/u +rqPfLA//T1a1rqVsDz3Ozx+EDtqslPvXN4RNHtn6kQOR+0d9JkuA/habErjHzpv3 +pH1OwKo8f+iOE9tWjZpUOIfDUcFSfX/5EyEGTWKqg51H8Eu8rD1OTs11+i/VDoqs +oSi7I2SrUu0nNfAMcgYK1omYXs5euN/9VySujAMo0n0CHz6bGwyGkObBZSkYYJUa +oSAxxkrLQRQcYWrPloDxJgsvySZ3gMnrxesZp0WQl2eCBZXEzKf/GJyjdZqrDPzV +3ClJ952tzqNcrSFzzXK+UduM5heQcXvglL951StimzLgefrR1uDfQ6KD7dnysVdz +N88EfsLpDMufBoQK8lf5COYiR4Mi4DE81/vqSr/dmZemtZDD49jrrpZGol47nILg +BkAHqfEmfYXScUIU4w6YYD4ZBmdw+9WctSbXHOuX5z9m6/52LLVuZ62caEW4ZoNg +W9hv+Okfd6S4MGavZzwMoYuEQXUPhxbFXCDx58G3zO3RrJDpjAeZouqrKjGNTu9G +bVZPGjiABAcnYVYHFZgJiwO5b93DGDco3+2LvgaodmaBCBBqjLuEekNOqZaKnH7a +ufcIkDHfZyBvHV8b6ISImmx4xuPSeln8K5RQV+Bz4s2CZapt8lryPZwOvNjLA9EP +lOy8+Dk3afwaGrwRUcpu16eCRZT6QvHE+bLd7TJd0OWusVBX7Mg= +=iDHZ +-----END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-translations-7.1.7.2.tar.xz.asc b/SOURCES/libreoffice-translations-7.1.7.2.tar.xz.asc deleted file mode 100644 index f048009..0000000 --- a/SOURCES/libreoffice-translations-7.1.7.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmF5MzEACgkQ9DSh76/u -rqPg8A//b0GQhbJ7HvvN1tqg9arFk+sKELpwSdP3qsCHn89jNzSvGg62TL10sYhu -7CSBa7cqwdSMUDIEFjukZ+iUCClfLTilEo1i9Vtc4QXCgy1msFAdsxBAtMdHbRiN -u0AWII370BlXjsM7RAj/Qcn+z+TFLsMEM8KrKWFb0XBAxKdDUXyfhFFZxvEUNWDh -g5lK6ojyCT47WdEx1dQFBPKqld1MA6bcOf5hY+L0oo6MSVGGuB6uXQOUp7oKE1cQ -TscaeB0X6/dBlQXyHDRfIGYuys42NWPpsXo8e2r6USJnTsCSjYFI8MtS1Z5YCEjk -EOrQyrS0SnqjvoYmsTzb8bcwR5ydcqmGk07JV/1qLiYcEGuk28jEkRgOm4zi6d3N -hz/zU0XwUBrffFw3jzuzL14CcdC+8xGn5kN4mwHSO1YUVCgxgXYE/Gpv0EzX0Es8 -5RlpQcM4f+Vgo3L62ZFfZLqD1RfKNGZ2iq1N/SxEbWOJYNWO5aUWEZmEi5QZMgqH -9v0zZuZ5tIDrOW5kw9lImZmvY21sEzLBsfboc8oxmJFbzsAkaFxZs6R/IZJbdUIp -qDkUpgIiNaE9XJl2600xD2jC3f5nH4F+qmKrPFxFpkqc+FdVzNRHa2n83WG7D13F -+DDhochyKpHfq36wo93GTjHeAXEHP8G4E3kZ4MyH1VFze6o5olQ= -=tYyX ------END PGP SIGNATURE----- diff --git a/SOURCES/libreoffice-translations-7.1.8.1.tar.xz.asc b/SOURCES/libreoffice-translations-7.1.8.1.tar.xz.asc new file mode 100644 index 0000000..089eb26 --- /dev/null +++ b/SOURCES/libreoffice-translations-7.1.8.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGqk3EACgkQ9DSh76/u +rqPU8g/8DwKupld+tKgdYYTjrbxn0eKRU8Rj9J94Z6MTr/hgxC+lewywg/ks+D0J +YFn2Stc95Z52bm9k7dg/sGqJYYXTACiAnvtTWe6jnk9Ze4k/4iMbIoTivnI5C2dU +M96crGxkFbpEJAEOaMTClckt3cJ0Cfm3s+IHZS6ydjjOnYDv8PaRcOZbbRnzQtuh +8/vit3Xlp3RN2dxCilgv3JnL4woTCKnWIuL/nBHk606DcFlHYBLsgAQdA/Nbt0hs +KG2S3PiAgB2hfuoduNV33IfEkCn/nzA1GxGhkv6WLYh/PuCxG0KULsNndrTOD2gU +Vxyiun+eMk9X/Rh6Pqd7Vn75bttsHEiorScejXRkcZcaM+vyKapHgf2N+ynXDU4k +amzhaimwroTwt1jFX046NsuFIUY8Ck4xlbWkPv34u/EgZRaKHAX0PhNCZJigTsTM +vagEyHYvo+WLDk+IxNRVBx5ceTbB8PzNXQc+cyvnoy/RuswqsjaijSrbautiyM2m +jStUAiOxBKanye8IztJuCSUPNczfi85bZ2PDxuAxytAgfwKpiEvMCJR4lpoOpeW4 +EXuFWzNnpH6j28aro2fQQhZcp4XSxQuxkrjJ5+gtsIxyiCSizVfPzrAYNGAtwrHI +f9q+sKdmywywUZ6W2LXYL8f3excZddjum9aVm2cmpezy1mXLX/k= +=a6IV +-----END PGP SIGNATURE----- diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index b7bfa67..25ae061 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.1.7 +%global libo_version 7.1.8 # 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. @@ -49,8 +49,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 3%{?libo_prerelease}%{?dist} +Version: %{libo_version}.1 +Release: 1%{?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/ @@ -1027,6 +1027,11 @@ sed -i -e /CppunitTest_xmlsecurity_signing/d xmlsecurity/Module_xmlsecurity.mk sed -i -e /CppunitTest_xmlsecurity_pdfsigning/d xmlsecurity/Module_xmlsecurity.mk sed -i -e /CppunitTest_sal_osl/d sal/Module_sal.mk sed -i -e /CppunitTest_emfio_emf/d emfio/Module_emfio.mk +%ifarch s390x +sed -i -e /CppunitTest_dbaccess_hsqlbinary_import/d dbaccess/Module_dbaccess.mk +sed -i -e /CppunitTest_vcl_svm_test/d vcl/Module_vcl.mk +sed -i -e /CustomTarget_uno_test/d testtools/Module_testtools.mk +%endif git commit -q -a -m 'temporarily disable failing tests' @@ -1510,11 +1515,9 @@ for jar in %{buildroot}%{baseinstdir}/program/classes/*.jar; do done %check -%ifnarch s390x make unitcheck slowcheck # we don't need this anymore rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar -%endif %files @@ -2249,6 +2252,12 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Tue Dec 14 2021 Caolán McNamara - 1:7.1.8.1-1 +- upgrade to 7.1.8 + +* Wed Dec 01 2021 Caolán McNamara - 1:7.1.7.2-4 +- Resolves: rhbz#2027211 enable make check on s390x + * Mon Nov 22 2021 Caolán McNamara - 1:7.1.7.2-3 - Resolves: rhbz2023185 merge in fedora 34 changes