From 191618f26fbef752a32b97c05e22dd2b5c965644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 16 Aug 2018 08:38:59 +0100 Subject: [PATCH] 6.1.X series --- .gitignore | 12 ++++++------ libreoffice.spec | 24 +++++++----------------- sources | 12 ++++++------ 3 files changed, 19 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 5eff671..679510f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,9 @@ /17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip /185d60944ea767075d27247c3162b3bc-unowinreg.dll /libreoffice-multiliblauncher.sh -/libreoffice-6.0.6.2.tar.xz -/libreoffice-6.0.6.2.tar.xz.asc -/libreoffice-help-6.0.6.2.tar.xz -/libreoffice-help-6.0.6.2.tar.xz.asc -/libreoffice-translations-6.0.6.2.tar.xz -/libreoffice-translations-6.0.6.2.tar.xz.asc +/libreoffice-6.1.0.3.tar.xz +/libreoffice-6.1.0.3.tar.xz.asc +/libreoffice-help-6.1.0.3.tar.xz +/libreoffice-help-6.1.0.3.tar.xz.asc +/libreoffice-translations-6.1.0.3.tar.xz +/libreoffice-translations-6.1.0.3.tar.xz.asc diff --git a/libreoffice.spec b/libreoffice.spec index c538ad3..88dca9e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 6.0.6 +%global libo_version 6.1.0 # 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. @@ -63,7 +63,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 +Version: %{libo_version}.3 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/ @@ -266,22 +266,9 @@ Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release} # want a nice abrt report Patch0: 0001-don-t-suppress-crashes.patch # not upstreamed -Patch1: 0001-Related-tdf-106100-recover-mangled-svg-in-presentati.patch +Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # not upstreamed -Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch -# not upstreamed -Patch3: 0001-gtk3-only-for-3.20.patch -Patch4: 0001-Related-tdf-105998-except-cut-and-paste-as-bitmap-in.patch -Patch5: 0001-request-installation-of-langpack-via-packagekit.patch -Patch6: 0001-forcepoint-fix-out-of-bounds-read-in-ICU.patch -Patch7: 0001-Upgrade-to-ICU-61.1.patch -Patch8: 0001-Keep-the-still-relevant-part-of-external-icu-icu4c-u.patch -Patch9: 0001-We-use-ICU-61-now.patch -Patch10: 0001-Upgrade-to-ICU-62.1.patch -Patch11: 0001-Use-ICU_MAJOR-instead-of-hard-coded-Upgrade-to-ICU-6.patch -Patch12: 0001-implement-pdf-export-of-underline-for-outlined-font.patch -Patch13: 0001-cov-scan-help-warnings.patch -Patch14: 0001-cov-scan-warnings.patch +Patch2: 0001-gtk3-only-for-3.20.patch %if 0%{?rhel} # not upstreamed @@ -2327,6 +2314,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Thu Aug 16 2018 Caolán McNamara - 1:6.1.0.3-1 +- 6.1.X series + * Tue Aug 14 2018 Caolán McNamara - 1:6.0.6.2-1 - latest version diff --git a/sources b/sources index 2d9297c..4b6ec34 100644 --- a/sources +++ b/sources @@ -5,9 +5,9 @@ SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6f SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd -SHA512 (libreoffice-6.0.6.2.tar.xz) = 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517 -SHA512 (libreoffice-6.0.6.2.tar.xz.asc) = 5735f29a438120592b3c361437ff46057c1edc1bdb5bb6e3ed1d3d3cec7293df6277081145f4ffe2347ef608c9b06b867e7e7023eaa39cf047c4bc2b83f31738 -SHA512 (libreoffice-help-6.0.6.2.tar.xz) = 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13 -SHA512 (libreoffice-help-6.0.6.2.tar.xz.asc) = ba2550157d155988e7604d0d0a143f1afad994dd08f29fcc1371c0a23aad89468fb2cb59bebcceb15fea95e97cbd3c920f7784ffad110d60cdf63515b9eb21a2 -SHA512 (libreoffice-translations-6.0.6.2.tar.xz) = fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5bf04fe0680807cb9af5f46f838bac6e6a5c88f90f88c5f2c -SHA512 (libreoffice-translations-6.0.6.2.tar.xz.asc) = d9c1ddecc773d95ec5fc3ce99fbed2e8f899ef24e56c4aeddae6e9a64705979f23f9835027f06b2aefcabe3d185384f49ad69a26506e93d6d1adc27267217428 +SHA512 (libreoffice-6.1.0.3.tar.xz) = 9461c183a41d23aecd3de75b2ec765def426643b19f25aeff4524f06e510a46677a8449c294881d59173398453e2cc4c11dbaa79ef642c2b9886d504c0b7667f +SHA512 (libreoffice-6.1.0.3.tar.xz.asc) = b1dc85ae8b31907b2cffd61b40ff7c82a17ec121415fe7e1d44b555fdbb6acf50fd7f38a205a822c4c1ad9154333a002e8a28a4e8fe45776142e73d190d012ce +SHA512 (libreoffice-help-6.1.0.3.tar.xz) = 7aac2b5c77710335669a71023f913f37a417e641b1d65517af4a50af5e34a7078d76761a894c5f7e608fb8ac1b7978f7a6f8a7b3cb56e38112605bbe9e958fc7 +SHA512 (libreoffice-help-6.1.0.3.tar.xz.asc) = 87f4c4622e97f62c5dc794ee9b0f68aff09b2b60470dbe1f48055b4108aa0f3238b338a4e322e09124b8868483d3fbe330eeef198ea8d16d5e5866a536d2715d +SHA512 (libreoffice-translations-6.1.0.3.tar.xz) = 8510d5f98ad62c0489a6f79093aa35956dc8512ab9b332105227721cce6c4a0fe6d84ed2708196bb98cd17b4410e844e2250902d19f370cf3efe43aa1935670f +SHA512 (libreoffice-translations-6.1.0.3.tar.xz.asc) = 88295d0ddbcea1a89bc23ce3b7a1b898fec87ec86c573e789016332ebf0188475e15e1bb9210ef6ba0fb4f621a344c18ec27ffecd5c59c6c067f2cc17d22524f