diff --git a/libreoffice.changes b/libreoffice.changes index 0cd75b8..060757f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 4 00:46:52 UTC 2017 - zaitor@opensuse.org + +- Add conditional liberation2-fonts BuildRequires and Recommends + for Tumbleweed, it is better suited for the version of freetype2 + we have available. + ------------------------------------------------------------------- Wed Feb 1 13:10:25 UTC 2017 - adam.majer@suse.de diff --git a/libreoffice.spec b/libreoffice.spec index 4d4249e..9c68554 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -114,7 +114,11 @@ BuildRequires: java-devel >= 1.6 BuildRequires: junit4 BuildRequires: libbase BuildRequires: libcppunit-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: liberation2-fonts +%else BuildRequires: liberation-fonts +%endif BuildRequires: libexif %if %{with firebird} BuildRequires: pkgconfig(fbclient) @@ -217,7 +221,11 @@ Requires: python3 Requires(post): update-desktop-files Requires(postun): update-desktop-files Recommends: google-carlito-fonts +%if 0%{?suse_version} >= 1330 +Recommends: liberation2-fonts +%else Recommends: liberation-fonts +%endif Provides: %{name}-draw-extensions = %{version} Obsoletes: %{name}-draw-extensions < %{version} Provides: %{name}-impress-extensions = %{version} @@ -635,10 +643,10 @@ appearance and behavior. %package base-drivers-mysql Summary: MySQL Database Driver for LibreOffice -License: GPL-2.0 and LGPL-3.0 -Group: Productivity/Office/Suite # This mysql thing is just dlopened # WARNING: the soname might change! +License: GPL-2.0 and LGPL-3.0 +Group: Productivity/Office/Suite Requires: libmysqlclient_r18 Requires: libreoffice-base = %{version} Requires(pre): libreoffice = %{version}