- 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
This commit is contained in:
Tomáš Chvátal 2016-02-06 12:55:00 +00:00 committed by Git OBS Bridge
parent 24de665af6
commit 1bc70f5e70
2 changed files with 5 additions and 19 deletions

View File

@ -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 Sat Feb 6 12:45:55 UTC 2016 - tchvatal@suse.com

View File

@ -632,15 +632,6 @@ Requires: %{name} = %{version}
%description gnome %description gnome
This package contains some GNOME extensions for LibreOffice. 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 %package kde4
Summary: KDE4 Extensions for LibreOffice Summary: KDE4 Extensions for LibreOffice
License: LGPL-3.0 License: LGPL-3.0
@ -1209,10 +1200,6 @@ set +x
install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so
echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt 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 # update desktop files
builddir=`pwd` 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 %files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root) %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 %files -f file-lists/kde4_list.txt kde4
%defattr(-,root,root) %defattr(-,root,root)