From 2a5f2c2c3027eda1c49784b7b89cde5a1fb72218c13cbd1ab311434b33aedd2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Apr 2018 11:28:15 +0000 Subject: [PATCH 1/5] - Reduce archs to only those that are really capable of finishing the build OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=623 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 5005b31..6a1d189 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 3 11:27:47 UTC 2018 - tchvatal@suse.com + +- Reduce archs to only those that are really capable of finishing + the build + ------------------------------------------------------------------- Tue Apr 3 09:18:42 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 0957b3a..f3731dd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -239,7 +239,7 @@ Provides: %{name}-icon-theme-crystal = %{version} 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 system_gpgme} BuildRequires: libgpgmepp-devel %else From 9e400802e9f537228050b41d365a304856564b65084200fcdd222bc9523ab086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Apr 2018 11:39:30 +0000 Subject: [PATCH 2/5] - Update glib2 requirement to match what code actually uses OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=624 --- libreoffice.changes | 5 +++++ libreoffice.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 6a1d189..c5fd7e2 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 3 11:39:13 UTC 2018 - tchvatal@suse.com + +- Update glib2 requirement to match what code actually uses + ------------------------------------------------------------------- Tue Apr 3 11:27:47 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index f3731dd..945fee9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -160,6 +160,7 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(epoxy) >= 1.2 BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(graphite2) >= 0.9.3 @@ -259,8 +260,6 @@ BuildRequires: pkgconfig(fbclient) %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} From 6d7b30771208dbf524aa0eebaa059cb4f2d7b58c1a111c7abdf14e5fed9cd34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 3 Apr 2018 11:54:07 +0000 Subject: [PATCH 3/5] - Conditionalize gtk3 build as it requires "newer" gnome than the one we ship on SLE12 currently OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=625 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 20 ++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index c5fd7e2..36744e8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -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 diff --git a/libreoffice.spec b/libreoffice.spec index 945fee9..cb02b53 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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 @@ -160,14 +162,12 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(epoxy) >= 1.2 BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(graphite2) >= 0.9.3 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) @@ -241,6 +241,10 @@ Obsoletes: %{name}-icon-theme-crystal < %{version} Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} 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 @@ -493,10 +497,8 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice. 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. @@ -505,8 +507,8 @@ This package contains Gtk3 interface rendering option for LibreOffice. 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 @@ -973,7 +975,11 @@ export NOCONFIGURE=yes --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 \ @@ -1394,8 +1400,10 @@ exit 0 %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 From b861310ff3c02d8210bce7dfc647b462cc3436480ffce035bbe385bac6d59ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 4 Apr 2018 09:09:53 +0000 Subject: [PATCH 4/5] - Reduce the ifarch condition based on new exclusivearch - Name directly dependencies that were accidentaly pulled by gtk3 before OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=626 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 23 ++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 36744e8..1e23485 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 3 12:26:41 UTC 2018 - tchvatal@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 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index cb02b53..eb52b2b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -211,6 +211,7 @@ BuildRequires: pkgconfig(python3) 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 @@ -360,10 +361,10 @@ Group: Productivity/Office/Suite 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 @@ -573,10 +574,10 @@ Software Development Kit (SDK). 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 @@ -614,10 +615,10 @@ Requires: libreoffice-calc = %{version} 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 @@ -634,10 +635,10 @@ Group: Productivity/Office/Suite 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 @@ -1229,8 +1230,10 @@ rm pyfiles.txt 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 +# Symlink gtk3 libreofficekit to libdir +%if %{with gtk3} ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so +%endif %if !%{with system_gpgme} chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11 @@ -1346,6 +1349,7 @@ exit 0 %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 @@ -1360,6 +1364,7 @@ exit 0 %{_datadir}/gir-1.0/LOKDocView-0.1.gir %dir %{_includedir}/LibreOfficeKit %{_includedir}/LibreOfficeKit/*.h +%endif %files glade %dir %{_datadir}/glade From 85b0bc9d1d60b1993518f434455c01ae34f4bafe1e0eaa6343fedae1f5f4fa3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 4 Apr 2018 10:27:19 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=627 --- libreoffice.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index eb52b2b..05aeea1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1230,9 +1230,13 @@ rm pyfiles.txt cp %{SOURCE3} %{buildroot}%{_libdir}/libreoffice/share/palette/SUSE.soc echo "%{_libdir}/libreoffice/share/palette/SUSE.soc" >> file-lists/common_list.txt -# Symlink gtk3 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} @@ -1265,10 +1269,6 @@ export DESTDIR=%{buildroot} 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}