From c4223a3a96494a8a8e4ca1c0ae87c15dbeb1516d5cd21a3e0cd57cd217eff7a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 Oct 2017 12:21:13 +0000 Subject: [PATCH] - Disable kde4 integration on Tumbleweed as libqt4 is build with openssl-1.0 while we need openssl-1.1 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=536 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index a29228a..fbd4eca 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 11 12:20:25 UTC 2017 - tchvatal@suse.com + +- Disable kde4 integration on Tumbleweed as libqt4 is build with + openssl-1.0 while we need openssl-1.1 + ------------------------------------------------------------------- Tue Oct 10 05:54:01 UTC 2017 - fstrba@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 7c16615..cb8af2b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -25,7 +25,7 @@ %define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.2 #%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/ # Wether to enable the kde integration -%if 0%{?is_opensuse} +%if 0%{?is_opensuse} && 0%{?suse_version} < 1330 %bcond_without kdeintegration %else %bcond_with kdeintegration