pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Split out gtk3 again but this time install it on openSUSE and

Browse Source 
avoid it on SLE12

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=402
This commit is contained in:
Tomáš Chvátal 2016-05-04 12:08:09 +00:00 committed by Git OBS Bridge
parent bb8f8c342f
commit 669da5359c
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -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 Tue Apr 26 09:46:38 UTC 2016 - andras.timar@collabora.com

29
libreoffice.spec
View File

@ -670,12 +670,21 @@ Summary: GNOME Extensions for LibreOffice
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Requires: %{name} = %{version} Requires: %{name} = %{version}
# Merged back to gnome, was split on 5.0 series only
Provides: %{name}-gtk3 = %{version}
Obsoletes: %{name}-gtk3 < %{version}
%description gnome %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 %package kde4
Summary: KDE4 Extensions for LibreOffice Summary: KDE4 Extensions for LibreOffice
@ -1276,6 +1285,12 @@ 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
%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 # update desktop files
builddir=`pwd` 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 %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
%if %{with kdeintegration} %if %{with kdeintegration}
%files -f file-lists/kde4_list.txt kde4 %files -f file-lists/kde4_list.txt kde4
%defattr(-,root,root) %defattr(-,root,root)