diff --git a/libreoffice.changes b/libreoffice.changes index f5051a3..92f8a0c 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 11 11:56:03 UTC 2015 - tchvatal@suse.com + +- Split out gtk3 UI to separate subpkg that requires gnome subpkg + * This is to allow people to test gtk3 while it not being default + ------------------------------------------------------------------- Wed Sep 9 07:34:59 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 2b2aef4..14138b8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -617,6 +617,16 @@ 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} = %{version} +Requires: %{name}-gnome = %{version} + +%description gnome +This package contains Gtk3 interface rendering option for LibreOffice. + %package kde4 Summary: KDE4 Extensions for LibreOffice License: LGPL-3.0 @@ -1166,6 +1176,9 @@ 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 +sed -i -e ":%{libdir}/libreoffice/program/libvclplug_gtk3lo.so:d" file-lists/gnome_list.txt + ################ # update desktop files builddir=`pwd` @@ -1185,8 +1198,7 @@ for desktop in * ; do app=`echo $desktop_new | sed "s/.desktop//"` %suse_update_desktop_file $app done -# FIXED: (only the first sed part) 4.3 branch -sed -i -e 's:Office;:Office;Spreadsheet;:g' -e 's:NoDisplay=false:NoDisplay=true:g' %{buildroot}/%{_datadir}/applications/math.desktop +sed -i -e 's:NoDisplay=false:NoDisplay=true:g' %{buildroot}/%{_datadir}/applications/math.desktop cd - ################ # compat stuff for noarch packages @@ -1540,6 +1552,10 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) +%files gtk3 +%defattr(-,root,root) +%{libdir}/libreoffice/program/libvclplug_gtk3lo.so + %files -f file-lists/kde4_list.txt kde4 %defattr(-,root,root)