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

- Conditionalize gtk3 build as it requires "newer" gnome than the

Browse Source 
one we ship on SLE12 currently

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=625
This commit is contained in:
Tomáš Chvátal 2018-04-03 11:54:07 +00:00 committed by Git OBS Bridge
parent 9e400802e9
commit 6d7b307712
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 3 11:52:09 UTC 2018 - tchvatal@suse.com
- Conditionalize gtk3 build as it requires "newer" gnome than the
one we ship on SLE12 currently
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 3 11:39:13 UTC 2018 - tchvatal@suse.com Tue Apr 3 11:39:13 UTC 2018 - tchvatal@suse.com

20
libreoffice.spec
View File

@ -37,6 +37,7 @@
%endif %endif
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
%bcond_without system_gpgme %bcond_without system_gpgme
%bcond_without gtk3
%else %else
# Hack in the bundled libs to not pop up on requires/provides to avoid # Hack in the bundled libs to not pop up on requires/provides to avoid
# faking libreoffice provide some system packages # faking libreoffice provide some system packages
@ -44,6 +45,7 @@
%global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$ %global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$
%global __requires_exclude ^libgpgmepp\\.so.*$ %global __requires_exclude ^libgpgmepp\\.so.*$
%bcond_with system_gpgme %bcond_with system_gpgme
%bcond_with gtk3
%endif %endif
Name: libreoffice Name: libreoffice
Version: 6.0.3.2 Version: 6.0.3.2
@ -160,14 +162,12 @@ BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(epoxy) >= 1.2 BuildRequires: pkgconfig(epoxy) >= 1.2
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0) >= 2.40
BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(graphite2) >= 0.9.3 BuildRequires: pkgconfig(graphite2) >= 0.9.3
BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(gssrpc)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42 BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42
BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(hunspell)
@ -241,6 +241,10 @@ Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version} Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: aarch64 %{ix86} x86_64 ExclusiveArch: aarch64 %{ix86} x86_64
%if %{with gtk3}
BuildRequires: pkgconfig(glib-2.0) >= 2.40
BuildRequires: pkgconfig(gtk+-3.0)
%endif
%if %{with system_gpgme} %if %{with system_gpgme}
BuildRequires: libgpgmepp-devel BuildRequires: libgpgmepp-devel
%else %else
@ -493,10 +497,8 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice.
Summary: Gtk3 interface for LibreOffice Summary: Gtk3 interface for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Requires: %{name}-gnome = %{version} Requires: %{name}-gnome = %{version}
%if 0%{?suse_version} > 1315 || 0%{?is_opensuse}
Supplements: packageand(libreoffice:gnome-session) Supplements: packageand(libreoffice:gnome-session)
Supplements: packageand(libreoffice:mate-session-manager) Supplements: packageand(libreoffice:mate-session-manager)
%endif
%description gtk3 %description gtk3
This package contains Gtk3 interface rendering option for LibreOffice. This package contains Gtk3 interface rendering option for LibreOffice.
@ -505,8 +507,8 @@ This package contains Gtk3 interface rendering option for LibreOffice.
Summary: Gtk2 interface for LibreOffice Summary: Gtk2 interface for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Recommends: %{name}-gnome = %{version} Recommends: %{name}-gnome = %{version}
# We are default on SLE12 # We are default if gtk3 is not present
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %if !%{with gtk3}
Supplements: packageand(libreoffice:gnome-session) Supplements: packageand(libreoffice:gnome-session)
%endif %endif
# Without kde integration we provide gtk2 interface there # Without kde integration we provide gtk2 interface there
@ -973,7 +975,11 @@ export NOCONFIGURE=yes
--disable-systray \ --disable-systray \
--disable-gstreamer-0-10 \ --disable-gstreamer-0-10 \
--enable-gstreamer-1-0 \ --enable-gstreamer-1-0 \
%if %{with gtk3}
--enable-gtk3 \ --enable-gtk3 \
%else
--disable-gtk3 \
%endif
--enable-introspection \ --enable-introspection \
--with-doxygen \ --with-doxygen \
--enable-release-build \ --enable-release-build \
@ -1394,8 +1400,10 @@ exit 0
%files -f file-lists/gnome_list.txt gnome %files -f file-lists/gnome_list.txt gnome
%if %{with gtk3}
%files gtk3 %files gtk3
%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so %{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
%endif
%files gtk2 %files gtk2
%{_libdir}/libreoffice/program/libvclplug_gtklo.so %{_libdir}/libreoffice/program/libvclplug_gtklo.so