From 2b34299cabe2adf3856595dc5c7ada4ed6a9fc9a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 02 2021 09:32:00 +0000 Subject: import libreoffice-5.3.6.1-25.el7_9 --- diff --git a/.gitignore b/.gitignore index 67c56b8..53e724e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,12 +6,5 @@ SOURCES/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip SOURCES/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip SOURCES/libreoffice-5.3.6.1.tar.xz -SOURCES/libreoffice-base-symbolic.svg -SOURCES/libreoffice-calc-symbolic.svg -SOURCES/libreoffice-draw-symbolic.svg SOURCES/libreoffice-help-5.3.6.1.tar.xz -SOURCES/libreoffice-impress-symbolic.svg -SOURCES/libreoffice-main-symbolic.svg -SOURCES/libreoffice-math-symbolic.svg SOURCES/libreoffice-translations-5.3.6.1.tar.xz -SOURCES/libreoffice-writer-symbolic.svg diff --git a/.libreoffice.metadata b/.libreoffice.metadata index 6be2519..fb92f0c 100644 --- a/.libreoffice.metadata +++ b/.libreoffice.metadata @@ -6,12 +6,5 @@ a0cc67aa534167bb59bcca0dc6a7db2573814542 SOURCES/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 2d49e11b0b711970f494294dc3698f05eb294853 SOURCES/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip a53d7b1105a3f6b2354360d8c429a941bd279c87 SOURCES/libreoffice-5.3.6.1.tar.xz -54fc749ba924f9ca4e0391caaf579ab344302038 SOURCES/libreoffice-base-symbolic.svg -9de544172d736d59589767000c1f657034a5d53d SOURCES/libreoffice-calc-symbolic.svg -0f6dc4726da0920869354fbe4b2924f9ac569b4a SOURCES/libreoffice-draw-symbolic.svg b2e71f3d22c78cdda92a025239ad726993a35921 SOURCES/libreoffice-help-5.3.6.1.tar.xz -8c74dd667c660cc643c4d715dd50491ba92146d5 SOURCES/libreoffice-impress-symbolic.svg -c77acd04a7647b09745f9424ab0f65d52dfcd397 SOURCES/libreoffice-main-symbolic.svg -3857a55644148eb25ed1a594bd00d1262761fb39 SOURCES/libreoffice-math-symbolic.svg e03af054c438537fdeabec0e02c6b43b74ab99e0 SOURCES/libreoffice-translations-5.3.6.1.tar.xz -d4f0674ad46a832120db956cc01a27fdc2060458 SOURCES/libreoffice-writer-symbolic.svg diff --git a/SOURCES/0001-Resolves-rhbz-1900004-Support-Red-Hat-Inc.-as-Java-v.patch b/SOURCES/0001-Resolves-rhbz-1900004-Support-Red-Hat-Inc.-as-Java-v.patch new file mode 100644 index 0000000..b8b0a1e --- /dev/null +++ b/SOURCES/0001-Resolves-rhbz-1900004-Support-Red-Hat-Inc.-as-Java-v.patch @@ -0,0 +1,44 @@ +From 3d4ae8919e4134cf5f7af4832d516329d06203c4 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 1 Dec 2020 13:05:50 +0100 +Subject: [PATCH] Resolves: rhbz#1900004 Support Red Hat, Inc. as Java vendor + +(Backporting "tdf#124503: Support JRE +installations with unknown java.vendor property" would have caused lots of merge +conflicts, so just add "Red Hat, Inc." as a cheap fix.) + +Change-Id: I343dd50a1d5ecfea478c66d58a5a72a09d5aa65b +--- + jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 3 +++ + jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +index 969ed01c6c21..d0a5bd114ace 100644 +--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml ++++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +@@ -40,5 +40,8 @@ + + 1.6.0 + ++ ++ 1.6.0 ++ + + +diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +index a08b237b62cd..b000684242a2 100644 +--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +@@ -49,6 +49,7 @@ BEGIN_VENDOR_MAP() + VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo) + #endif + VENDOR_MAP_ENTRY("Azul Systems, Inc.", OtherInfo) ++ VENDOR_MAP_ENTRY("Red Hat, Inc.", OtherInfo) + END_VENDOR_MAP() + + +-- +2.28.0 + diff --git a/SOURCES/libreoffice-base-symbolic.svg b/SOURCES/libreoffice-base-symbolic.svg new file mode 100644 index 0000000..16f3cef --- /dev/null +++ b/SOURCES/libreoffice-base-symbolic.svg @@ -0,0 +1,27 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + diff --git a/SOURCES/libreoffice-calc-symbolic.svg b/SOURCES/libreoffice-calc-symbolic.svg new file mode 100644 index 0000000..bf56588 --- /dev/null +++ b/SOURCES/libreoffice-calc-symbolic.svg @@ -0,0 +1,27 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + diff --git a/SOURCES/libreoffice-draw-symbolic.svg b/SOURCES/libreoffice-draw-symbolic.svg new file mode 100644 index 0000000..7ca94ee --- /dev/null +++ b/SOURCES/libreoffice-draw-symbolic.svg @@ -0,0 +1,26 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + diff --git a/SOURCES/libreoffice-impress-symbolic.svg b/SOURCES/libreoffice-impress-symbolic.svg new file mode 100644 index 0000000..9a16f76 --- /dev/null +++ b/SOURCES/libreoffice-impress-symbolic.svg @@ -0,0 +1,25 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + diff --git a/SOURCES/libreoffice-main-symbolic.svg b/SOURCES/libreoffice-main-symbolic.svg new file mode 100644 index 0000000..6bd3103 --- /dev/null +++ b/SOURCES/libreoffice-main-symbolic.svg @@ -0,0 +1,24 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + diff --git a/SOURCES/libreoffice-math-symbolic.svg b/SOURCES/libreoffice-math-symbolic.svg new file mode 100644 index 0000000..66cd9e7 --- /dev/null +++ b/SOURCES/libreoffice-math-symbolic.svg @@ -0,0 +1,25 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + diff --git a/SOURCES/libreoffice-writer-symbolic.svg b/SOURCES/libreoffice-writer-symbolic.svg new file mode 100644 index 0000000..e97b545 --- /dev/null +++ b/SOURCES/libreoffice-writer-symbolic.svg @@ -0,0 +1,28 @@ + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index 142bac6..edc3e03 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -57,7 +57,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 24%{?libo_prerelease}%{?dist} +Release: 25%{?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 Artistic and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -290,6 +290,7 @@ Patch60: CVE-2019-9853.patch Patch61: CVE-2019-9854.patch Patch62: CVE-2019-9855.patch Patch63: 0001-rhbz-1728763-bg-of-blocks-is-black.patch +Patch64: 0001-Resolves-rhbz-1900004-Support-Red-Hat-Inc.-as-Java-v.patch %if 0%{?rhel} # not upstreamed @@ -2352,6 +2353,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Tue Dec 01 2020 Stephan Bergmann - 1:5.3.6.1-25 +- Resolves: rhbz#1900004 Support Red Hat, Inc. as Java vendor + * Tue Oct 29 2019 Caolán McNamara - 1:5.3.6.1-24 - Resolves: rhbz#1728763 bg of blocks is black