Accepting request 569245 from LibreOffice:Factory

- Require xorg-x11-fonts otherwise nothing is shown

- Do not pull in liberation2-fonts wrt bsc#1077375#c5

OBS-URL: https://build.opensuse.org/request/show/569245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=144
This commit is contained in:
Dominique Leuenberger 2018-01-26 12:58:11 +00:00 committed by Git OBS Bridge
commit ca583e1cfb
2 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jan 24 14:02:23 UTC 2018 - tchvatal@suse.com
- Require xorg-x11-fonts otherwise nothing is shown
-------------------------------------------------------------------
Wed Jan 24 12:34:09 UTC 2018 - tchvatal@suse.com
- Do not pull in liberation2-fonts wrt bsc#1077375#c5
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 17 19:29:11 UTC 2018 - tchvatal@suse.com Wed Jan 17 19:29:11 UTC 2018 - tchvatal@suse.com

View File

@ -42,6 +42,7 @@
# faking libreoffice provide some system packages # faking libreoffice provide some system packages
%global __provides_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$ %global __provides_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$
%global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$ %global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$
%global __requires_exclude ^libgpgmepp\\.so.*$
%bcond_with system_gpgme %bcond_with system_gpgme
%endif %endif
Name: libreoffice Name: libreoffice
@ -219,6 +220,7 @@ Requires: libreoffice-icon-themes = %{version}
# We need at least english to launch ourselves. # We need at least english to launch ourselves.
Requires: libreoffice-l10n-en = %{version} Requires: libreoffice-l10n-en = %{version}
Requires: python3 Requires: python3
Requires: xorg-x11-fonts
Requires(post): update-desktop-files Requires(post): update-desktop-files
Requires(postun): update-desktop-files Requires(postun): update-desktop-files
Recommends: dejavu-fonts Recommends: dejavu-fonts
@ -251,13 +253,8 @@ BuildRequires: libboost_system-devel
%else %else
BuildRequires: boost-devel BuildRequires: boost-devel
%endif %endif
%if 0%{?suse_version} >= 1330
BuildRequires: liberation2-fonts
Recommends: liberation2-fonts
%else
BuildRequires: liberation-fonts BuildRequires: liberation-fonts
Recommends: liberation-fonts Recommends: liberation-fonts
%endif
%if %{with firebird} %if %{with firebird}
BuildRequires: pkgconfig(fbclient) BuildRequires: pkgconfig(fbclient)
%endif %endif