- For now disable qt5 integration as it is utterly broken

* just keep the kde4 one

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=573
This commit is contained in:
Tomáš Chvátal 2018-01-02 12:48:53 +00:00 committed by Git OBS Bridge
parent ed24709609
commit ca68884495
2 changed files with 9 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 2 12:51:58 UTC 2018 - tchvatal@suse.com
- For now disable qt5 integration as it is utterly broken
* just keep the kde4 one
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 20 20:03:58 UTC 2017 - tchvatal@suse.com Wed Dec 20 20:03:58 UTC 2017 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice # spec file for package libreoffice
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -265,10 +265,6 @@ BuildRequires: pkgconfig(fbclient)
%endif %endif
%if %{with kdeintegration} %if %{with kdeintegration}
BuildRequires: libkde4-devel BuildRequires: libkde4-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
# needed for filepicker # needed for filepicker
BuildRequires: pkgconfig(glib-2.0) >= 2.4 BuildRequires: pkgconfig(glib-2.0) >= 2.4
%else %else
@ -998,7 +994,7 @@ export NOCONFIGURE=yes
--without-export-validation \ --without-export-validation \
--enable-odk \ --enable-odk \
%if %{with kdeintegration} %if %{with kdeintegration}
--enable-qt5 \ --disable-qt5 \
--enable-kde4 \ --enable-kde4 \
%else %else
--disable-qt5 \ --disable-qt5 \
@ -1403,7 +1399,7 @@ exit 0
%{_libdir}/libreoffice/program/libvclplug_gtklo.so %{_libdir}/libreoffice/program/libvclplug_gtklo.so
%if %{with kdeintegration} %if %{with kdeintegration}
%files -f file-lists/kde4_list.txt qt5 %files -f file-lists/kde4_list.txt kde4
%endif %endif
%files -f file-lists/officebean_list.txt officebean %files -f file-lists/officebean_list.txt officebean