From 7c1cc9b7ca0f5bcc591618ce76002e749ca78dbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 9 Jun 2021 12:24:09 +0100 Subject: [PATCH] latest version --- .gitignore | 12 ++++++------ libreoffice.spec | 19 ++++++++++--------- sources | 12 ++++++------ 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index f313864..d381f26 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ /f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz -/libreoffice-7.1.3.2.tar.xz -/libreoffice-7.1.3.2.tar.xz.asc -/libreoffice-help-7.1.3.2.tar.xz -/libreoffice-help-7.1.3.2.tar.xz.asc -/libreoffice-translations-7.1.3.2.tar.xz -/libreoffice-translations-7.1.3.2.tar.xz.asc +/libreoffice-7.1.4.2.tar.xz +/libreoffice-7.1.4.2.tar.xz.asc +/libreoffice-help-7.1.4.2.tar.xz +/libreoffice-help-7.1.4.2.tar.xz.asc +/libreoffice-translations-7.1.4.2.tar.xz +/libreoffice-translations-7.1.4.2.tar.xz.asc diff --git a/libreoffice.spec b/libreoffice.spec index a53204a..6d2ac21 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.1.3 +%global libo_version 7.1.4 # 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. @@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 6%{?libo_prerelease}%{?dist} +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/ @@ -250,12 +250,12 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch3: 0001-fix-detecting-qrcodegen.patch Patch4: 0001-rhbz-1918152-fix-FTBFS.patch Patch5: 0001-Get-rid-of-apache-commons-logging.patch -Patch6: 0001-rhbz-1956977-crash-on-switch-from-active-comment-to-.patch -Patch7: 0001-Related-tdf-138888-fix-assertion-on-avmedia-MediaCon.patch -Patch8: 0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch -Patch9: 0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch -Patch10: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch -Patch11: 0001-Replace-inet_ntoa-with-inet_ntop.patch +Patch6: 0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch +Patch7: 0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch +Patch8: 0001-gtk3-workaround-missing-gdk_threads_enter-calls-in-e.patch +Patch9: 0001-Replace-inet_ntoa-with-inet_ntop.patch +Patch10: 0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch +Patch11: 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2241,7 +2241,8 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog -* Wed Jun 09 2021 Caolán McNamara - 1:7.1.3.2-6 +* Wed Jun 09 2021 Caolán McNamara - 1:7.1.4.2-1 +- latest version - replace 'badfuncs' of inet_addr and inet_ntoa * Fri Jun 04 2021 Python Maint - 1:7.1.3.2-5 diff --git a/sources b/sources index d2590f3..fd78c57 100644 --- a/sources +++ b/sources @@ -7,9 +7,9 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838d SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.1.3.2.tar.xz) = d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72 -SHA512 (libreoffice-7.1.3.2.tar.xz.asc) = 9952bef51e851cd0b2601dce06304885cb9e53924641c5bf21f64ddd0c63c48c4be9223282640cb1fb84976be27e74e587781177c2155369017d3ad92147e4da -SHA512 (libreoffice-help-7.1.3.2.tar.xz) = 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb -SHA512 (libreoffice-help-7.1.3.2.tar.xz.asc) = 0c1a2280b855cc06d5698ff36448dbe9379bf84a2c3acbb755ff4f69de145b1909dd38ab7dc5498b29687841a101b9cd87e1a00f3abdc03b9015ebda8b28e454 -SHA512 (libreoffice-translations-7.1.3.2.tar.xz) = df320e5c41e94c08847b1f504461f6dcd11bc9c301ec0e219fead05a24982c0946e98263320c53357f89e8497e56871da071fff41f780f4ae8bf45859a88b34d -SHA512 (libreoffice-translations-7.1.3.2.tar.xz.asc) = 7562148d64429a035c0d54973ed041e4623c181aa6f65a16448f14efa84b4ef36f3f8abb8cddf28cd47ba540f314d48d98f02a0fde2b0f269d180861c9c54637 +SHA512 (libreoffice-7.1.4.2.tar.xz) = b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8 +SHA512 (libreoffice-7.1.4.2.tar.xz.asc) = 89eeb1605dca242bffd8f341b23dfc0e5f0cfbb95a5b554436a6f9e62783021d4596bdca62ad010c46e74c3861d63c9e006391a4d9a2ff355393caeb42db9e43 +SHA512 (libreoffice-help-7.1.4.2.tar.xz) = 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268 +SHA512 (libreoffice-help-7.1.4.2.tar.xz.asc) = e5383926d4e2e676758dbd0a485113b9eda49e52aa38f29a17acd5134d7018f1e523fd96fb59d1ab916f5fd28737cacebaa0348b4ca1a6866359c168a1b9a498 +SHA512 (libreoffice-translations-7.1.4.2.tar.xz) = 987a4f9c86d70c52bdb80a89b73428aae63725a5c7e0def464a35220bf22b29adaa56937f93e0c48cee43e47a16d385b079acc2d0aa8b23b637e447a2eed30c4 +SHA512 (libreoffice-translations-7.1.4.2.tar.xz.asc) = 9c0a0d15b2ff18a3d704a338ee9939108d408584a12e9b3c381b36fcd5aa8bd9e9000f15487eebe65c5fa3a16d7289f557df17d05b5f8f8cd4de9021974999b3