From 1bc70f5e70ad4eed2233eaf2d49202d1c541e0554ad47a00dbad9018de5f16a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 6 Feb 2016 12:55:00 +0000 Subject: [PATCH] - Un-split the gtk3 from separate module 5.1 should be stable enough OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=367 --- libreoffice.changes | 5 +++++ libreoffice.spec | 19 ------------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 8ca9c3d..5614d05 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 6 12:54:39 UTC 2016 - tchvatal@suse.com + +- Un-split the gtk3 from separate module 5.1 should be stable enough + ------------------------------------------------------------------- Sat Feb 6 12:45:55 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 905c48b..ddde94f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -632,15 +632,6 @@ Requires: %{name} = %{version} %description gnome This package contains some GNOME extensions for LibreOffice. -%package gtk3 -Summary: Gtk3 interface for LibreOffice -License: LGPL-3.0 -Group: Productivity/Office/Suite -Requires: %{name}-gnome = %{version} - -%description gtk3 -This package contains Gtk3 interface rendering option for LibreOffice. - %package kde4 Summary: KDE4 Extensions for LibreOffice License: LGPL-3.0 @@ -1209,10 +1200,6 @@ 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 -grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_list.txt > tmplist -mv tmplist file-lists/gnome_list.txt - ################ # update desktop files builddir=`pwd` @@ -1570,12 +1557,6 @@ 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 - %files -f file-lists/kde4_list.txt kde4 %defattr(-,root,root)