From 20002c857a78d56d0d415d1b1b20cc480ca396c7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Feb 01 2022 09:08:58 +0000 Subject: rhbz#2029810 tune s390x/aarch64 for non-interactive installs --- diff --git a/libreoffice.spec b/libreoffice.spec index 474abce..7f96544 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -41,6 +41,13 @@ %bcond_with smallbuild %endif +# 'serverconfig' is tuned for non-interactive installs +%ifarch s390 s390x aarch64 +%bcond_with serverconfig +%else +%bcond_without serverconfig +%endif + # generated by %%langpack definitions %global langpack_langs %{nil} @@ -311,7 +318,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} +%if ! %{with serverconfig} 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 @@ -1367,7 +1376,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 +%if %{with serverconfig} +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