rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to 7.2.3

Browse Source
f41
Caolán McNamara 3 years ago
parent be57ea8d28
commit f13fd67cbd
4 changed files with 17 additions and 61 deletions
Show Stats Download Patch File Download Diff File

12
.gitignore vendored
Unescape View File

@ -6,9 +6,9 @@
/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf /f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
/libreoffice-multiliblauncher.sh /libreoffice-multiliblauncher.sh
/dtoa-20180411.tgz /dtoa-20180411.tgz
/libreoffice-7.2.2.2.tar.xz /libreoffice-7.2.3.2.tar.xz
/libreoffice-7.2.2.2.tar.xz.asc /libreoffice-7.2.3.2.tar.xz.asc
/libreoffice-help-7.2.2.2.tar.xz /libreoffice-help-7.2.3.2.tar.xz
/libreoffice-help-7.2.2.2.tar.xz.asc /libreoffice-help-7.2.3.2.tar.xz.asc
/libreoffice-translations-7.2.2.2.tar.xz /libreoffice-translations-7.2.3.2.tar.xz
/libreoffice-translations-7.2.2.2.tar.xz.asc /libreoffice-translations-7.2.3.2.tar.xz.asc

45
0001-document-new-shouldn-t-get-prefixed-to-become-libreo.patch
Unescape View File

@ -1,45 +0,0 @@
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

8
libreoffice.spec
Unescape View File

@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit # download path contains version without the last (fourth) digit
%global libo_version 7.2.2 %global libo_version 7.2.3
# Should contain .alphaX / .betaX, if this is pre-release (actually # Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names, # 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. # so we need a way to define it easily at one place.
@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.2 Version: %{libo_version}.2
Release: 3%{?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 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/ URL: http://www.libreoffice.org/
@ -249,7 +249,6 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# backported # backported
Patch3: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch Patch3: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
Patch4: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch Patch4: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Patch5: 0001-document-new-shouldn-t-get-prefixed-to-become-libreo.patch
# not upstreamed # not upstreamed
Patch500: 0001-disable-libe-book-support.patch Patch500: 0001-disable-libe-book-support.patch
@ -2247,6 +2246,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit
%changelog %changelog
* Fri Nov 19 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.3.2-1
- upgrade to 7.2.3 (likely will fix rhbz#2022410)
* Tue Oct 12 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.2.2-3 * Tue Oct 12 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.2.2-3
- Icon=document-new shouldn't get prefixed to become - Icon=document-new shouldn't get prefixed to become
Icon=libreoffice-document-new Icon=libreoffice-document-new

13
sources
Unescape View File

@ -3,13 +3,12 @@ SHA512 (35c94d2df8893241173de1d16b6034c0-swingExSrc.zip) = 4a48f1e32907fb2dee601
SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
SHA512 (libreoffice-7.2.2.2.tar.xz) = 9adc14aa2aa24e1e91b32f0663d3fed8421baf78c3d310e8cc52ae70ea338b9d58406344d22d2c2fa6f91f10ae91945ef2d5713036f9144705bdb4c19ad69ca7 SHA512 (libreoffice-7.2.3.2.tar.xz) = b59e679025115cf176faf8a153833ed5ebac374372ba46bef46da22657dda399b88b3d503bfaf9964184d2dde4b19d3852d53c27cf6ceb0dd4967077b45eb5f6
SHA512 (libreoffice-7.2.2.2.tar.xz.asc) = 229215280f6930136c793efaac9d0578068b1894b432119223f649bd888d68572b2b11d4ba6215939ebb1a71bdabc1fef8e07780e2d8a9fe1325acb2bcb3e21b SHA512 (libreoffice-7.2.3.2.tar.xz.asc) = 187d45b60de46487de5d215d759dbe7af1f2441d3c2dc7c3585e90ef52e26500a96946085ac7986f0364d91ef0c9dd79a4165ec38d6cd074e632171ae8d627c2
SHA512 (libreoffice-help-7.2.2.2.tar.xz) = 1e3a250b68f591c0dc0cd5d57843baa370ed009faabc9446826e8207043af5d193a263b85b9443a2baf1cb64366d90d08b763adf9ec9865d256f760f847ea638 SHA512 (libreoffice-help-7.2.3.2.tar.xz) = 64ab9d676cc86116ec8aac1157aee33551932f2047f1c47cde865e50e39438f497b7b08073c3f058fae4870325950bad1a5063a55b8897ecb09c046c98bf7264
SHA512 (libreoffice-help-7.2.2.2.tar.xz.asc) = fac140c750a2504198ea5dce596e11043ad707b0d0de41dcfdd0a3f236232bcb160d0a4ca86b6610b0039215a6f4d27ea22b340e4d2a8f38a67642e6ff55a0dd SHA512 (libreoffice-help-7.2.3.2.tar.xz.asc) = 45dfa2b92ab0491a54dd8a52e1b3499dee1feb320cfb834df7b9c6065fbc9992478b0ab0391f887a0e84da28a199e68f9a1e6e36bbb39b31efa94517f41bf665
SHA512 (libreoffice-translations-7.2.2.2.tar.xz) = 3bfda8085b7276104a949140098c56d0ceee054913bfd640961e74439529e729e4d73aed4e1c300ecfdc3f84820ca931f640b8f53b9270567adfead14055413b SHA512 (libreoffice-translations-7.2.3.2.tar.xz) = a415d0e3e368c6d9fcccbdc22ed4c369ba744ae2f6fb35ca1e8294d10395520f84369695f72200fc70c2ec00ca9987f7f4a83d1f342397e6624e845150922c4a
SHA512 (libreoffice-translations-7.2.2.2.tar.xz.asc) = 82b315ffcfcfe450d772dd9b933244ec90227f9016079cecb75af72b1ff5ac02643d95334c63bb3d67802df326ff98f5ac5f943e8b3cf406a19e98ce69e5a3db SHA512 (libreoffice-translations-7.2.3.2.tar.xz.asc) = 9dd7be6d85809fe027cd12362caa01b6ef004b8e3ac8c304eae1395acb75586a0359c8e614a184a085d47e027ab5a9c8faeafde4e0dcdb62dc8b99c96744a597

Write Preview
Loading…
Cancel
Save