Resolves: rhbz#2014990 upgrade to 7.1.7
This commit is contained in:
Caolán McNamara
parent
c420128551
commit
60066a9a28
12
.gitignore
vendored
12
.gitignore
vendored
@ -6,9 +6,9 @@
|
||||
/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
|
||||
/libreoffice-multiliblauncher.sh
|
||||
/dtoa-20180411.tgz
|
||||
/libreoffice-7.1.5.2.tar.xz
|
||||
/libreoffice-7.1.5.2.tar.xz.asc
|
||||
/libreoffice-help-7.1.5.2.tar.xz
|
||||
/libreoffice-help-7.1.5.2.tar.xz.asc
|
||||
/libreoffice-translations-7.1.5.2.tar.xz.asc
|
||||
/libreoffice-translations-7.1.5.2.tar.xz
|
||||
/libreoffice-7.1.7.2.tar.xz
|
||||
/libreoffice-7.1.7.2.tar.xz.asc
|
||||
/libreoffice-help-7.1.7.2.tar.xz
|
||||
/libreoffice-help-7.1.7.2.tar.xz.asc
|
||||
/libreoffice-translations-7.1.7.2.tar.xz
|
||||
/libreoffice-translations-7.1.7.2.tar.xz.asc
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
From ce37356f6bcaaef62a80814d7d54d3aa6d53167d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 12 Oct 2021 09:52:53 +0100
|
||||
Subject: [PATCH] document-new shouldn't get prefixed to become
|
||||
libreoffice-document-new
|
||||
|
||||
seen by rpminspect as .desktop "references icon libreoffice-document-new
|
||||
but no subpackages contain libreoffice-document-new"
|
||||
|
||||
introduced by:
|
||||
|
||||
commit f767d5e2b017c0d0cfd23ff3318cb30901847722
|
||||
Date: Sun Sep 1 11:30:12 2019 +0200
|
||||
|
||||
Add icons to New Document desktop file actions
|
||||
|
||||
in the [Desktop Action NewDocument] section
|
||||
|
||||
Change-Id: I64ce5e2dbaca32083b2f76e960c33a815f8a3773
|
||||
---
|
||||
sysui/desktop/share/brand.pl | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
|
||||
index 9d73e619c495..b17a7374fd62 100644
|
||||
--- a/sysui/desktop/share/brand.pl
|
||||
+++ b/sysui/desktop/share/brand.pl
|
||||
@@ -81,9 +81,11 @@ while ($arg = shift) {
|
||||
# remove possible Windows line-ends
|
||||
chomp;
|
||||
|
||||
- # patch all occurrences of openoffice in ICON line with
|
||||
- # $prefix
|
||||
- s/Icon=/Icon=$iconprefix/;
|
||||
+ # patch all icons in ICON line with $prefix
|
||||
+ if (! /Icon=document-new/ ) { # except for Icon=document-new which
|
||||
+ # is a stock icon, not one of ours
|
||||
+ s/Icon=/Icon=$iconprefix/;
|
||||
+ }
|
||||
|
||||
# patch all occurrences of openoffice in icon_filename
|
||||
# line with $prefix
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# download path contains version without the last (fourth) digit
|
||||
%global libo_version 7.1.6
|
||||
%global libo_version 7.1.7
|
||||
# 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: 2%{?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/
|
||||
|
||||
@ -258,6 +258,7 @@ Patch9: 0001-math.desktop-include-Spreadsheet-category.patch
|
||||
Patch10: 0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch
|
||||
Patch11: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
|
||||
Patch12: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
|
||||
Patch13: 0001-document-new-shouldn-t-get-prefixed-to-become-libreo.patch
|
||||
|
||||
# not upstreamed
|
||||
Patch500: 0001-disable-libe-book-support.patch
|
||||
@ -2244,6 +2245,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_includedir}/LibreOfficeKit
|
||||
|
||||
%changelog
|
||||
* Fri Oct 29 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.7.2-1
|
||||
- Resolves: rhbz#2014990 upgrade to 7.1.7
|
||||
|
||||
* Mon Oct 11 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.6.2-2
|
||||
- Resolves: rhbz#2001452 upgrade to 7.1.6
|
||||
|
||||
|
||||
12
sources
12
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.6.2.tar.xz) = 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257
|
||||
SHA512 (libreoffice-7.1.6.2.tar.xz.asc) = 0440990844bd4aba4c5aef768692fbda9060fa4b229807b2b2fceab7ea1b14abf017a5bca281c4f80e68a9e746dd9367ad17101e7497a0e08f60881144b56d07
|
||||
SHA512 (libreoffice-help-7.1.6.2.tar.xz) = 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad
|
||||
SHA512 (libreoffice-help-7.1.6.2.tar.xz.asc) = 02d2bd820ed446f7e18044fe0e1efd29078334a99ab241b5aa3da6a24066adf6c8caa21898ce18bfbdbe19d80d8dad59c45185460ccd92edc6579772ea5a78ac
|
||||
SHA512 (libreoffice-translations-7.1.6.2.tar.xz) = 0e9bc25acc6ff1f35ac2acff8bf17e66a0188ca9b7d46c1da44e92e3a5a025477f877dc14499b74c71ddd43423fb097fbe2b69a69e11b30d0771cfe5bfb88626
|
||||
SHA512 (libreoffice-translations-7.1.6.2.tar.xz.asc) = 22c8f2f57db0a138108dfa437e85583227b12274228b970d0150b2843bc945de1af1c15d1a0c4397ba00f3a2e08d226d46a278a0307eb45ca711970aaeac86f8
|
||||
SHA512 (libreoffice-7.1.7.2.tar.xz) = fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
|
||||
SHA512 (libreoffice-7.1.7.2.tar.xz.asc) = fa939cd144ebf49e7751819dab5368c8f1e65fd98f65ffbf947cf143a99e25e35c50c9322d771c7decdc1c74239af95c973495c49eda019d15a2a017533052ca
|
||||
SHA512 (libreoffice-help-7.1.7.2.tar.xz) = 20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268
|
||||
SHA512 (libreoffice-help-7.1.7.2.tar.xz.asc) = f7ffa2e83bc7c76e6423aaf01c0ff63952b2d7cc846f7c53cfdd09a9e36071dd259984a5d8505a21fc71560c99b96d6034c06e8cc3530aadeacabe0701a7146d
|
||||
SHA512 (libreoffice-translations-7.1.7.2.tar.xz) = 276c38cfc490ffb2c1a7c336b041a5ea6b7fd0c187dda09e7ecffa9355b0fe8a741ad5c81cdd6abe02804c6d901cc9692bdf66773711d87935bd2dbbb354f730
|
||||
SHA512 (libreoffice-translations-7.1.7.2.tar.xz.asc) = 659532b1d10734619b16f0c10d40a3dd6c68f91b6421afbeb23cba7774724b744f42225f24f5f82e0e1726de1e2358dc010e704de95005be1fe7f6ad715734ed
|
||||
|
||||
Loading…
Reference in New Issue
Block a user