From 61166b0a2ad121927fc12d5af3af3e7d0e6cb250 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sun, 13 Feb 2022 04:26:01 +0000 Subject: [PATCH] import libreoffice-6.4.7.2-10.el8 --- SPECS/libreoffice.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index a75c22a..44e5e0d 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 8%{?libo_prerelease}%{?dist} +Release: 10%{?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/ @@ -328,7 +328,9 @@ Summary: Core modules for LibreOffice Requires: %{name}-%{fontname}-fonts = %{epoch}:%{version}-%{release} Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-data = %{epoch}:%{version}-%{release} +%ifnarch s390 s390x aarch64 Requires: %{name}-plugin%{?_isa} = %{epoch}:%{version}-%{release} +%endif Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts @@ -1353,7 +1355,12 @@ for file in *.desktop; do $file done # rhbz#186515 do not show startcenter -sed -i -e /NoDisplay/s/false/true/ startcenter.desktop +desktop-file-edit --set-key=NoDisplay --set-value=true startcenter.desktop +%ifarch s390 s390x aarch64 +for app in base calc draw impress math startcenter writer xsltfilter; do + desktop-file-edit --set-key=NoDisplay --set-value=true $app.desktop +done +%endif # relocate the .desktop and icon files install -m 0755 -d %{buildroot}%{_datadir}/applications for app in base calc draw impress math startcenter writer xsltfilter; do @@ -2268,6 +2275,13 @@ done %{_includedir}/LibreOfficeKit %changelog +* Mon Feb 07 2022 Caolán McNamara - 1:6.4.7.2-10 +- Related: rhbz#2029810 bump n-v-r + +* Mon Jan 31 2022 Caolán McNamara - 1:6.4.7.2-9 +- Related: rhbz#2029810 set NoDisplay=true for .desktop on s390x/aarch64 +- Related: rhbz#2029810 don't Require any vclplug for s390x/aarch64 + * Tue Dec 07 2021 Caolán McNamara - 1:6.4.7.2-8 - Resolves: rhbz#2029810 enable make check on s390x