From d229117bf670b7ee9355f32bc9b1dae1a653074f553eca9c36bc4b709c02d0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 Jan 2018 12:54:08 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=584 --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index be92275..a21d194 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,6 +42,7 @@ # faking libreoffice provide some system packages %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 ^libgpgmepp.so.*$ %bcond_with system_gpgme %endif Name: libreoffice From 8ef7d742d9958bd64fd6932c0d758c0eb6eccc7ed4d6368a8f77db1bd0a1d416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 Jan 2018 12:56:23 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=585 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index a21d194..30fa246 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -42,7 +42,7 @@ # faking libreoffice provide some system packages %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 ^libgpgmepp.so.*$ +%global __requires_exclude ^libgpgmepp\\.so.*$ %bcond_with system_gpgme %endif Name: libreoffice From dc854054b3479a56f6b1a3e10cd2a589200d7dc275fd9782e9ecbae2632a1acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jan 2018 12:35:11 +0000 Subject: [PATCH 3/4] - Do not pull in liberation2-fonts wrt bsc#1077375#c5 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=587 --- libreoffice.changes | 5 +++++ libreoffice.spec | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index f6b7565..0bf8001 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 30fa246..47c0493 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -252,13 +252,8 @@ BuildRequires: libboost_system-devel %else BuildRequires: boost-devel %endif -%if 0%{?suse_version} >= 1330 -BuildRequires: liberation2-fonts -Recommends: liberation2-fonts -%else BuildRequires: liberation-fonts Recommends: liberation-fonts -%endif %if %{with firebird} BuildRequires: pkgconfig(fbclient) %endif From fd0a62de51b772ea5ff1610bcb9355fb5cdc1b54d36b8ec3b908c3cc07e2d8e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jan 2018 14:02:41 +0000 Subject: [PATCH 4/4] - Require xorg-x11-fonts otherwise nothing is shown OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=588 --- libreoffice.changes | 5 +++++ libreoffice.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 0bf8001..7b65899 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 47c0493..828c765 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -220,6 +220,7 @@ Requires: libreoffice-icon-themes = %{version} # We need at least english to launch ourselves. Requires: libreoffice-l10n-en = %{version} Requires: python3 +Requires: xorg-x11-fonts Requires(post): update-desktop-files Requires(postun): update-desktop-files Recommends: dejavu-fonts