Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2017-02-19 00:44:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2016-11-22 18:57:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2017-02-19 00:44:35.594359954 +0100 @@ -1,0 +2,103 @@ +Thu Feb 16 12:19:35 UTC 2017 - norm...@linux.vnet.ibm.com + +- bypass upstream bug for aarch64 and ppc64/ppc64le + https://bugs.documentfoundation.org/show_bug.cgi?id=105519 + removing some fods data files source of test failure. + +------------------------------------------------------------------- +Tue Feb 14 12:20:48 UTC 2017 - tchva...@suse.com + +- Fixup pyuno loading as it broke when we dropped the uno patch + +------------------------------------------------------------------- +Sat Feb 4 00:46:52 UTC 2017 - zai...@opensuse.org + +- Add conditional liberation2-fonts BuildRequires and Recommends + for Tumbleweed, it is better suited for the version of freetype2 + we have available. + +------------------------------------------------------------------- +Wed Feb 1 13:10:25 UTC 2017 - adam.ma...@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- +Wed Feb 1 10:53:18 UTC 2017 - tchva...@suse.com + +- Version update to 5.3.0.3: + * RC3 of the 5.3 targets with additional fixes + +------------------------------------------------------------------- +Fri Jan 20 12:03:38 UTC 2017 - tchva...@suse.com + +- Version update to 5.3.0.2: + * RC2 of the 5.3.0 target, stabilizing the lokit + +------------------------------------------------------------------- +Wed Jan 18 21:21:04 UTC 2017 - tchva...@suse.com + +- Provide the breeze-dark content in the breeze icontheme + +------------------------------------------------------------------- +Tue Jan 17 12:38:47 UTC 2017 - tchva...@suse.com + +- Drop system-pyuno.diff patch as it breaks services tests as the + pyuno was not loadable + +------------------------------------------------------------------- +Fri Jan 13 09:21:39 UTC 2017 - tchva...@suse.com + +- Version update to 5.3.0.1: + * RC candidate stabilizing ont he beta1 bump + +------------------------------------------------------------------- +Thu Jan 5 15:08:29 UTC 2017 - tchva...@suse.com + +- Fix unixODBC loading bnc#1017925 + * 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch + +------------------------------------------------------------------- +Wed Jan 4 20:11:44 UTC 2017 - tchva...@suse.com + +- Build firebird driver only for version 3, 2.x series does not pass + tests at all +- Drop 13.2 support, out of scope as EOL + +------------------------------------------------------------------- +Mon Dec 19 11:42:00 UTC 2016 - tchva...@suse.com + +- Version update to 5.3.0.beta2: + * Various bugfixes to bring 5.3 to stability + +------------------------------------------------------------------- +Sat Dec 3 12:15:27 UTC 2016 - tchva...@suse.com + +- Version update to 5.3.0.beta1: + * Starting of testing of new major release +- Refresh patch system-pyuno.diff +- Refresh again libreoffice-hotfix-disablebrokenshapetest.patch +- Drop upstreamed patches: + * libreoffice-firebird3-selftest.patch + * libreoffice-firebird3.patch + * 0001-allow-none-gi-support.patch +- Remove --enable-hardlink-deliver switch that is removed from autotools +- Add dep on libzmf, libstaroffice +- Update internal xmlsec + +------------------------------------------------------------------- +Sat Dec 3 11:46:40 UTC 2016 - tchva...@suse.com + +- Version update to 5.2.4.1 + * various bugfixes mostly containing L3 fixes: +- Fix L3 bnc#946674 LO-L3: Undo does not revert bundled font size changes for + table cells +- Fix L3 bnc#952640 LO-L3: Cut and Paste (at the same position) changes bullet + point formatting +- Fix L3 bnc#955548 LO-L3: CTRL+Z not working to undo changes performed through + Navigator +- Fix L3 bnc#959168 LO-L3: Undo on bullet point style change only works when + focus is not set +- bnc#957991 LO-L3: Improve pivot cache reading performance +- Refresh patch libreoffice-hotfix-disablebrokenshapetest.patch + +------------------------------------------------------------------- Old: ---- 0001-allow-none-gi-support.patch ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz firebird_integer_x64le_ods12.odb libreoffice-5.2.3.3.tar.xz libreoffice-firebird3-selftest.patch libreoffice-firebird3.patch libreoffice-help-5.2.3.3.tar.xz libreoffice-translations-5.2.3.3.tar.xz system-pyuno.diff New: ---- 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar libreoffice-5.3.0.3.tar.xz libreoffice-help-5.3.0.3.tar.xz libreoffice-translations-5.3.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.A1xpns/_old 2017-02-19 00:44:44.873054227 +0100 +++ /var/tmp/diff_new_pack.A1xpns/_new 2017-02-19 00:44:44.877053664 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,15 +22,20 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.3 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.0 # Wether to enable the kde integration -%if 0%{?is_opensuse} || %{suse_version} == 1320 +%if 0%{?is_opensuse} %bcond_without kdeintegration %else %bcond_with kdeintegration %endif +%if 0%{?suse_version} > 1320 +%bcond_without firebird +%else +%bcond_with firebird +%endif Name: libreoffice -Version: 5.2.3.3 +Version: 5.3.0.3 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -39,8 +44,6 @@ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz -# test database for Patch18 -Source20: firebird_integer_x64le_ods12.odb Source99: %{name}-rpmlintrc # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt @@ -51,7 +54,7 @@ Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # Internal bundled stuff we can't remove # XMLSec is patched over and over in here -Source2000: %{external_url}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz +Source2000: %{external_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz # To build this we would pull cygwin; not worth it Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll # hsqldb simply does not work with new system version, but luckily we migrate to firebird @@ -61,31 +64,35 @@ Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +# Needed for integration tests +Source2006: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar +Source2007: http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # PATCH-FIX-SUSE: disable really fragile test run on hsqldb Patch0: disable-flaky-hsqldb-test.patch # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff -# correctly bootstrap python stuff with system python (deb#501028, bnc#90701) -Patch3: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff +Patch6: 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch -# PATCH-FIX-UPSTREAM: fix build against (system) Firebird 3.0 -Patch17: libreoffice-firebird3.patch -Patch18: libreoffice-firebird3-selftest.patch -# PATCH-FIX-UPSTREAM: taken from 5.3 branch to fix working with sle12 gnome introspection -Patch19: 0001-allow-none-gi-support.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf BuildRequires: bison +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_date_time-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_iostreams-devel +BuildRequires: libboost_system-devel +%else BuildRequires: boost-devel +%endif BuildRequires: bsh2 BuildRequires: commons-codec BuildRequires: commons-httpclient @@ -107,10 +114,15 @@ BuildRequires: junit4 BuildRequires: libbase BuildRequires: libcppunit-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: liberation2-fonts +%else BuildRequires: liberation-fonts +%endif BuildRequires: libexif -# once FB 3.0 is in Factory, change to pkgconfig(fbclient) / pkgconfig(fbembed) -BuildRequires: libfbembed-devel +%if %{with firebird} +BuildRequires: pkgconfig(fbclient) +%endif BuildRequires: libfonts BuildRequires: libformula BuildRequires: libjpeg-devel @@ -179,16 +191,18 @@ BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.5 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 -BuildRequires: pkgconfig(liborcus-0.11) +BuildRequires: pkgconfig(liborcus-0.12) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libstaroffice-0.0) BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwps-0.4) >= 0.4.2 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(libzmf-0.0) BuildRequires: pkgconfig(mdds-1.2) BuildRequires: pkgconfig(mythes) BuildRequires: pkgconfig(nspr) >= 4.8 @@ -207,7 +221,11 @@ Requires(post): update-desktop-files Requires(postun): update-desktop-files Recommends: google-carlito-fonts +%if 0%{?suse_version} >= 1330 +Recommends: liberation2-fonts +%else Recommends: liberation-fonts +%endif Provides: %{name}-draw-extensions = %{version} Obsoletes: %{name}-draw-extensions < %{version} Provides: %{name}-impress-extensions = %{version} @@ -931,20 +949,25 @@ %if 0%{?suse_version} < 1330 %patch1 %endif -%patch3 -p1 %patch4 %patch5 +%patch6 -p1 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -cp -vn %{SOURCE20} dbaccess/qa/unit/data/ %patch990 -p1 # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile +# bypass test failure tracked by upstream bug +# https://bugs.documentfoundation.org/show_bug.cgi?id=105519 +%ifarch aarch64 ppc64 ppc64le +for xx in forecast.ets.add forecast.ets.mult linest logest minverse rate +do + rm sc/qa/unit/data/functions/fods/$xx.fods +done +%endif + %build # Parallel build settings ... lo_jobs="%{?jobs:%{jobs}}" @@ -1038,9 +1061,13 @@ %else --disable-kde4 \ %endif +%if %{with firebird} + --enable-firebird-sdbc \ +%else + --disable-firebird-sdbc \ +%endif --enable-evolution2 \ --enable-dbus \ - --enable-hardlink-deliver \ --enable-ext-ct2n \ --enable-ext-nlpsolver \ --enable-ext-numbertext \ @@ -1055,9 +1082,6 @@ --enable-symbols # no coinormp packages for coinmp -# hack to correctly bootstrap python stuff with system python, (deb#501028, bnc#90701) -sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py - # just call make here as we added the jobs in configure # The check phase is run here too if it is split with nocheck # install of jars get broken sometimes @@ -1074,8 +1098,10 @@ mv tmplist file-lists/gnome_list.txt # Remove firebird connector from main package filelist +%if %{with firebird} grep -v "%{_libdir}/libreoffice/program/libfirebird_sdbclo.so" file-lists/common_list.txt > tmplist mv tmplist file-lists/common_list.txt +%endif ################ # update desktop files @@ -1204,6 +1230,13 @@ # Remove pointless readmes rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ +# Prepare uno path detection, can't be patched in because it breaks tests +echo "import sys, os" > uno.py +echo "sys.path.append('%{baseinstdir}/program')" >> uno.py +echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{_libdir}/libreoffice/program/fundamentalrc')" >> uno.py +cat %{buildroot}%{_libdir}/%{name}/program/uno.py >> uno.py +cp uno.py %{buildroot}%{_libdir}/%{name}/program/uno.py + # Generate python cache files %py3_compile %{buildroot}/%{_libdir}/libreoffice/program/ %py3_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/ @@ -1232,8 +1265,10 @@ mkdir -p %{buildroot}%{python3_sitelib} ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py +ln -s %{_libdir}/libreoffice/program/officehelper.py %{buildroot}%{python3_sitelib}/officehelper.py echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt +echo "%{python3_sitelib}/officehelper.py" >> file-lists/pyuno_list.txt # move glade catalog to system glade dir install -m 0755 -d %{buildroot}%{_datadir}/glade/catalogs @@ -1340,7 +1375,6 @@ %{_libdir}/girepository-1.0/LOKDocView-0.1.typelib %{_libdir}/liblibreofficekitgtk.so %dir %{_libdir}/libreoffice/share/libreofficekit -%{_libdir}/libreoffice/share/libreofficekit/handle_graphic.png %{_libdir}/libreoffice/share/libreofficekit/handle_image_end.png %{_libdir}/libreoffice/share/libreofficekit/handle_image_middle.png %{_libdir}/libreoffice/share/libreofficekit/handle_image_start.png @@ -1385,9 +1419,11 @@ %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root) +%if %{with firebird} %files base-drivers-firebird %defattr(-,root,root) %{_libdir}/libreoffice/program/libfirebird_sdbclo.so +%endif %files -f file-lists/filters_list.txt filters-optional %defattr(-,root,root) @@ -1439,6 +1475,7 @@ %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_breeze.zip +%{_datadir}/%{name}/share/config/images_breeze_dark.zip %files icon-theme-galaxy %defattr(-,root,root) ++++++ 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch ++++++ >From 18f068baca7630afdc8d02a4e21a4aa1a9d70f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchva...@suse.com> Date: Thu, 5 Jan 2017 16:06:10 +0100 Subject: [PATCH] unixODBC changed soname to .2 so reflect it we dlopen this library and thus we should be able to find it with any soname, so far .1 and .2 seem to be used. Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280 --- dbaccess/source/ui/dlg/odbcconfig.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index cd1b583e1840..163fc8549d06 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -38,6 +38,7 @@ #ifdef MACOSX #define ODBC_LIBRARY "libiodbc.dylib" #else +#define ODBC_LIBRARY_2 "libodbc.so.2" #define ODBC_LIBRARY_1 "libodbc.so.1" #define ODBC_LIBRARY "libodbc.so" #endif @@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration() if ( !bLoaded ) bLoaded = load(ODBC_LIBRARY_1); #endif +#ifdef ODBC_LIBRARY_2 + if ( !bLoaded ) + bLoaded = load(ODBC_LIBRARY_2); +#endif if ( bLoaded ) { -- 2.11.0 ++++++ ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz -> 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz ++++++ ++++ 135807 lines of diff (skipped) ++++++ libreoffice-5.2.3.3.tar.xz -> libreoffice-5.3.0.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-5.2.3.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-5.3.0.3.tar.xz differ: char 27, line 1 ++++++ libreoffice-help-5.2.3.3.tar.xz -> libreoffice-help-5.3.0.3.tar.xz ++++++ ++++ 100454 lines of diff (skipped) ++++++ libreoffice-hotfix-disablebrokenshapetest.patch ++++++ --- /var/tmp/diff_new_pack.A1xpns/_old 2017-02-19 00:44:46.884771129 +0100 +++ /var/tmp/diff_new_pack.A1xpns/_new 2017-02-19 00:44:46.888770566 +0100 @@ -1,8 +1,8 @@ -Index: libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +Index: libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx =================================================================== ---- libreoffice-5.2.0.0.alpha1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -+++ libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -@@ -1103,29 +1103,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " +--- libreoffice-5.3.0.0.beta1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ++++ libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +@@ -1102,29 +1102,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " assertXPath(pXmlDoc, "//w:ind", "start", "1418"); } ++++++ libreoffice-translations-5.2.3.3.tar.xz -> libreoffice-translations-5.3.0.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-5.2.3.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-5.3.0.3.tar.xz differ: char 26, line 1
