diff --git a/libreoffice.changes b/libreoffice.changes index 397a638..aaf06ce 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 4 12:07:44 UTC 2016 - tchvatal@suse.com + +- Split out gtk3 again but this time install it on openSUSE and + avoid it on SLE12 + ------------------------------------------------------------------- Tue Apr 26 09:46:38 UTC 2016 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index a13aa07..c616665 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -670,12 +670,21 @@ Summary: GNOME Extensions for LibreOffice License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} -# Merged back to gnome, was split on 5.0 series only -Provides: %{name}-gtk3 = %{version} -Obsoletes: %{name}-gtk3 < %{version} %description gnome -This package contains some GNOME extensions for LibreOffice. +This package contains some GNOME extensions and GTK2 interface for LibreOffice. + +%package gtk3 +Summary: Gtk3 interface for LibreOffice +License: LGPL-3.0 +Group: Productivity/Office/Suite +Requires: %{name}-gnome = %{version} +%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} +Supplements: packageand(libreoffice:gnome-session) +%endif + +%description gtk3 +This package contains Gtk3 interface rendering option for LibreOffice. %package kde4 Summary: KDE4 Extensions for LibreOffice @@ -1276,6 +1285,12 @@ set +x install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt +# Split out gtk3 interface to -gtk3 subpackage +%if %{with newmedia} +grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist +mv tmplist file-lists/gnome_list.txt +%endif + ################ # update desktop files builddir=`pwd` @@ -1700,6 +1715,12 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) +%if %{with newmedia} +%files gtk3 +%defattr(-,root,root) +%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so +%endif + %if %{with kdeintegration} %files -f file-lists/kde4_list.txt kde4 %defattr(-,root,root)