rpms/libreoffice
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#2042817 tune s390x/aarch64 for non-interactive installs

Browse Source
This commit is contained in:
Caolán McNamara 2022-02-01 09:17:25 +00:00
parent f568cd712c
commit 180a08487c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libreoffice.spec
View File

@ -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}
@ -50,7 +57,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
Release: 2%{?libo_prerelease}%{?dist}
Release: 3%{?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/
@ -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
@ -1359,7 +1368,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
@ -2253,6 +2267,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Tue Feb 01 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.1.8.1-3
- Resolves: rhbz#2042817 tune s390x/aarch64 for non-interactive installs
* Mon Jan 10 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.1.8.1-2
- fix annocheck warning about missing .note.gnu.property-stack