diff --git a/libreoffice.changes b/libreoffice.changes index c5fd7e2..36744e8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 3 11:52:09 UTC 2018 - tchvatal@suse.com + +- Conditionalize gtk3 build as it requires "newer" gnome than the + one we ship on SLE12 currently + ------------------------------------------------------------------- Tue Apr 3 11:39:13 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 945fee9..cb02b53 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -37,6 +37,7 @@ %endif %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %bcond_without system_gpgme +%bcond_without gtk3 %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages @@ -44,6 +45,7 @@ %global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$ %global __requires_exclude ^libgpgmepp\\.so.*$ %bcond_with system_gpgme +%bcond_with gtk3 %endif Name: libreoffice Version: 6.0.3.2 @@ -160,14 +162,12 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(epoxy) >= 1.2 BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42 BuildRequires: pkgconfig(hunspell) @@ -241,6 +241,10 @@ Obsoletes: %{name}-icon-theme-crystal < %{version} Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 +%if %{with gtk3} +BuildRequires: pkgconfig(glib-2.0) >= 2.40 +BuildRequires: pkgconfig(gtk+-3.0) +%endif %if %{with system_gpgme} BuildRequires: libgpgmepp-devel %else @@ -493,10 +497,8 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice. Summary: Gtk3 interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name}-gnome = %{version} -%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} Supplements: packageand(libreoffice:gnome-session) Supplements: packageand(libreoffice:mate-session-manager) -%endif %description gtk3 This package contains Gtk3 interface rendering option for LibreOffice. @@ -505,8 +507,8 @@ This package contains Gtk3 interface rendering option for LibreOffice. 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} +# We are default if gtk3 is not present +%if !%{with gtk3} Supplements: packageand(libreoffice:gnome-session) %endif # Without kde integration we provide gtk2 interface there @@ -973,7 +975,11 @@ export NOCONFIGURE=yes --disable-systray \ --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ +%if %{with gtk3} --enable-gtk3 \ +%else + --disable-gtk3 \ +%endif --enable-introspection \ --with-doxygen \ --enable-release-build \ @@ -1394,8 +1400,10 @@ exit 0 %files -f file-lists/gnome_list.txt gnome +%if %{with gtk3} %files gtk3 %{_libdir}/libreoffice/program/libvclplug_gtk3lo.so +%endif %files gtk2 %{_libdir}/libreoffice/program/libvclplug_gtklo.so