From 8f5a8ba0b445700435da8ae574b5d3f518c63a4c2b1f2732d8d7d3936b5969f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 8 Jun 2018 14:22:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=664 --- libreoffice.spec | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index cf0e0a2..4cd9fe2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -32,7 +32,12 @@ %endif # Enable the kde integration on openSUSE only %if 0%{?is_opensuse} +# for some reason breaks on 32bit +%ifarch %ix86 +%bcond_with kdeintegration +%else %bcond_without kdeintegration +%endif %else %bcond_with kdeintegration %endif @@ -557,24 +562,16 @@ Supplements: packageand(libreoffice:plasma5-workspace) %description gtk2 This package contains Gtk2 interface rendering option for LibreOffice. -%package kde4 -Summary: KDE4 interface for LibreOffice -Group: Productivity/Office/Suite -Requires: %{name} = %{version} -# we need full kdelibs4 otherwise we will crash -Requires: kdelibs4 -Supplements: packageand(libreoffice:plasma5-workspace) - -%description kde4 -This package contains kde4 interface rendering options for LibreOffice. - %package qt5 -Summary: Qt5 interface for LibreOffice +Summary: Qt5/KDE Frameworks interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} +Supplements: packageand(libreoffice:plasma5-workspace) +Provides: %{name}-kde4 = %{version} +Obsoletes: %{name}-kde4 < %{version} %description qt5 -This package contains Qt5 interface rendering options for LibreOffice. +This package contains Qt5/KDE Frameworks interface rendering options for LibreOffice. %package sdk Summary: LibreOffice SDK @@ -993,6 +990,8 @@ export NOCONFIGURE=yes --enable-gtk3 \ %if %{with kdeintegration} --enable-gtk3-kde5 \ + --enable-kde5 \ + --disable-qt5 \ %endif %else --disable-gtk3 \ @@ -1435,7 +1434,7 @@ exit 0 %{_libdir}/libreoffice/program/libvclplug_gtklo.so %if %{with kdeintegration} -%files -f file-lists/kde4_list.txt kde4 +%files -f file-lists/kde4_list.txt qt5 %endif %files -f file-lists/officebean_list.txt officebean