- Reintroduce kde4 subpackage (now qt4 build with openssl-1.1)

- Add the gtk2 subpackage to not pull-in the gtk2 on current desktop
  * Also supplement as needed for SLE12

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=566

libreoffice.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 12 08:52:45 UTC 2017 - tchvatal@suse.com
+
+- Reintroduce kde4 subpackage (now qt4 build with openssl-1.1)
+- Add the gtk2 subpackage to not pull-in the gtk2 on current desktop
+  * Also supplement as needed for SLE12
+
 -------------------------------------------------------------------
 Mon Dec 11 14:38:26 UTC 2017 - tchvatal@suse.com
 

libreoffice.spec

@@ -25,7 +25,7 @@
 #%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.0
 %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} < 1500
 %bcond_without kdeintegration
 %else
 %bcond_with kdeintegration
@@ -264,6 +264,7 @@ Recommends:     liberation-fonts
 BuildRequires:  pkgconfig(fbclient)
 %endif
 %if %{with kdeintegration}
+BuildRequires:  libkde4-devel
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Network)
@@ -510,13 +511,35 @@ Supplements:    packageand(libreoffice:gnome-session)
 %description gtk3
 This package contains Gtk3 interface rendering option for LibreOffice.
 
+%package gtk2
+Summary:        Gtk2 interface for LibreOffice
+Group:          Productivity/Office/Suite
+Recommends:     %{name}-gnome = %{version}
+# We are default on SLE12
+%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
+Supplements:    packageand(libreoffice:gnome-session)
+%endif
+# Without kde integration we provide gtk2 interface there
+%if !%{with kdeintegration}
+Supplements:    packageand(libreoffice:plasma5-workspace)
+%endif
+
+%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}
+Supplements:    packageand(libreoffice:plasma5-workspace)
+
+%description kde4
+This package contains kde4 interface rendering options for LibreOffice.
+
 %package qt5
 Summary:        Qt5 interface for LibreOffice
 Group:          Productivity/Office/Suite
 Requires:       %{name} = %{version}
-Provides:       %{name}-kde4 = %{version}
-Obsoletes:      %{name}-kde4 < %{version}
-Supplements:    packageand(libreoffice:plasma5-workspace)
 
 %description qt5
 This package contains Qt5 interface rendering options for LibreOffice.
@@ -977,11 +1000,12 @@ export NOCONFIGURE=yes
         --without-help \
         --without-export-validation \
         --enable-odk \
-        --disable-kde4 \
 %if %{with kdeintegration}
         --enable-qt5 \
+        --enable-kde4 \
 %else
         --disable-qt5 \
+        --disable-kde4 \
 %endif
 %if %{with system_gpgme}
         --with-system-gpgmepp \
@@ -1029,6 +1053,9 @@ set +x
 # Split out gtk3 interface to -gtk3 subpackage
 grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist
 mv tmplist file-lists/gnome_list.txt
+# also split out gtk2 interface to make sure we do not pull gtk2 for fun of it
+grep -v "%{_libdir}/libreoffice/program/libvclplug_gtklo.so" file-lists/gnome_list.txt > tmplist
+mv tmplist file-lists/gnome_list.txt
 
 # Remove firebird connector from main package filelist
 %if %{with firebird}
@@ -1375,6 +1402,9 @@ exit 0
 %files gtk3
 %{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
 
+%files gtk2
+%{_libdir}/libreffice/program/libvclplug_gtklo.so
+
 %if %{with kdeintegration}
 %files -f file-lists/kde4_list.txt qt5
 %endif