Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2018-04-07 20:48:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Sat Apr 7 20:48:13 2018 rev:153 rq:593791 version:6.0.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2018-04-05
15:28:48.342304347 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes
2018-04-07 20:48:18.849376636 +0200
@@ -1,0 +2,24 @@
+Tue Apr 3 12:26:41 UTC 2018 - tchva...@suse.com
+
+- Reduce the ifarch condition based on new exclusivearch
+- Name directly dependencies that were accidentaly pulled by gtk3
+ before
+
+-------------------------------------------------------------------
+Tue Apr 3 11:52:09 UTC 2018 - tchva...@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 - tchva...@suse.com
+
+- Update glib2 requirement to match what code actually uses
+
+-------------------------------------------------------------------
+Tue Apr 3 11:27:47 UTC 2018 - tchva...@suse.com
+
+- Reduce archs to only those that are really capable of finishing
+ the build
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.bXpljD/_old 2018-04-07 20:48:27.457065107 +0200
+++ /var/tmp/diff_new_pack.bXpljD/_new 2018-04-07 20:48:27.465064818 +0200
@@ -37,6 +37,7 @@
%endif
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 &&
0%{?is_opensuse})
%bcond_without system_gpgme
+%bcond_without gtk3
%else
# Hack in the bundled libs to not pop up on requires/provides to avoid
# faking libreoffice provide some system packages
@@ -44,6 +45,7 @@
%global __requires_exclude_from
^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$
%global __requires_exclude ^libgpgmepp\\.so.*$
%bcond_with system_gpgme
+%bcond_with gtk3
%endif
Name: libreoffice
Version: 6.0.3.2
@@ -166,7 +168,6 @@
BuildRequires: pkgconfig(gssrpc)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0
-BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
BuildRequires: pkgconfig(harfbuzz-icu) >= 0.9.42
BuildRequires: pkgconfig(hunspell)
@@ -210,6 +211,7 @@
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24
+BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xt)
# We need at least english to launch ourselves.
Requires: liberation-fonts
@@ -239,7 +241,11 @@
Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version}
-ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc ppc64 ppc64le s390x
+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}
BuildRequires: libgpgmepp-devel
%else
@@ -259,8 +265,6 @@
%endif
%if %{with kdeintegration}
BuildRequires: libkde4-devel
-# needed for filepicker
-BuildRequires: pkgconfig(glib-2.0) >= 2.4
%else
Provides: %{name}-kde4 = %{version}
Obsoletes: %{name}-kde4 < %{version}
@@ -357,10 +361,10 @@
Requires: %{name} = %{version}
Requires: pentaho-reporting-flow-engine
Supplements: %{name}
-%ifarch %{arm} %{ix86} ppc
+%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
-%ifarch x86_64 aarch64 ppc64 ppc64le s390x
+%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@@ -494,10 +498,8 @@
Summary: Gtk3 interface for LibreOffice
Group: Productivity/Office/Suite
Requires: %{name}-gnome = %{version}
-%if 0%{?suse_version} > 1315 || 0%{?is_opensuse}
Supplements: packageand(libreoffice:gnome-session)
Supplements: packageand(libreoffice:mate-session-manager)
-%endif
%description gtk3
This package contains Gtk3 interface rendering option for LibreOffice.
@@ -506,8 +508,8 @@
Summary: Gtk2 interface for LibreOffice
Group: Productivity/Office/Suite
Recommends: %{name}-gnome = %{version}
-# We are default on SLE12
-%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
+# We are default if gtk3 is not present
+%if !%{with gtk3}
Supplements: packageand(libreoffice:gnome-session)
%endif
# Without kde integration we provide gtk2 interface there
@@ -572,10 +574,10 @@
Summary: OfficeBean Java Bean component for LibreOffice
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
-%ifarch %{arm} %{ix86} ppc
+%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
-%ifarch x86_64 aarch64 ppc64 ppc64le s390x
+%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@@ -613,10 +615,10 @@
Requires: libreoffice-pyuno = %{version}
Requires(pre): libreoffice = %{version}
# the watchWindow extension is written in java
-%ifarch %{arm} %{ix86} ppc
+%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
-%ifarch x86_64 aarch64 ppc64 ppc64le s390x
+%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@@ -633,10 +635,10 @@
Requires: libreoffice-writer = %{version}
Requires(pre): libreoffice = %{version}
# the wiki extension is written in java
-%ifarch %{arm} %{ix86} ppc
+%ifarch %{ix86}
Requires: jre-32 >= 1.6
%endif
-%ifarch x86_64 aarch64 ppc64 ppc64le s390x
+%ifarch x86_64 aarch64
Requires: jre-64 >= 1.6
%endif
@@ -974,7 +976,11 @@
--disable-systray \
--disable-gstreamer-0-10 \
--enable-gstreamer-1-0 \
+%if %{with gtk3}
--enable-gtk3 \
+%else
+ --disable-gtk3 \
+%endif
--enable-introspection \
--with-doxygen \
--enable-release-build \
@@ -1224,9 +1230,15 @@
cp %{SOURCE3} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc
echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >>
file-lists/common_list.txt
-# Symlink libreofficekit to libdir
+%if %{with gtk3}
+# Symlink gtk3 libreofficekit to libdir
ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so
%{buildroot}%{_libdir}/liblibreofficekitgtk.so
+# Libreofficekit headers
+mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/
+install -m 0644 include/LibreOfficeKit/*.h
%{buildroot}%{_includedir}/LibreOfficeKit/
+%endif
+
%if !%{with system_gpgme}
chrpath --replace '$ORIGIN'
%{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11
chrpath --replace '$ORIGIN'
%{buildroot}%{_libdir}/%{name}/program/libgpgmepp.so.6
@@ -1257,10 +1269,6 @@
export SRCDIR="./"
./solenv/bin/install-gdb-printers -a
%{_datadir}/gdb/auto-load%{_libdir}/%{name} -c -i %{_libdir}/%{name} -p
%{_datadir}/libreoffice/gdb
-# Libreofficekit headers
-mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/
-install -m 0644 include/LibreOfficeKit/*.h
%{buildroot}%{_includedir}/LibreOfficeKit/
-
# We have ton of duped files so run over it
%fdupes %{buildroot}%{_prefix}
@@ -1341,6 +1349,7 @@
%dir %{_datadir}/icons/locolor/32x32/apps
%dir %{_datadir}/icons/locolor/32x32/mimetypes
+%if %{with gtk3}
%files -n libreofficekit
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib
@@ -1355,6 +1364,7 @@
%{_datadir}/gir-1.0/LOKDocView-0.1.gir
%dir %{_includedir}/LibreOfficeKit
%{_includedir}/LibreOfficeKit/*.h
+%endif
%files glade
%dir %{_datadir}/glade
@@ -1395,8 +1405,10 @@
%files -f file-lists/gnome_list.txt gnome
+%if %{with gtk3}
%files gtk3
%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so
+%endif
%files gtk2
%{_libdir}/libreoffice/program/libvclplug_gtklo.so
