Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2017-11-14 14:18:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Tue Nov 14 14:18:23 2017 rev:140 rq:540480 version:5.4.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2017-10-20 16:12:23.401481989 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2017-11-14 14:18:27.944897441 +0100 @@ -1,0 +2,18 @@ +Fri Nov 3 12:21:12 UTC 2017 - [email protected] + +- Disable the verbosity of the build again, getting complaints of + build log is too long... + +------------------------------------------------------------------- +Thu Nov 2 13:36:04 UTC 2017 - [email protected] + +- Switch to bundled gpgme on old distros where it is not possible + to update +- Rebase scp2-user-config-suse.diff to apply again + +------------------------------------------------------------------- +Thu Nov 2 09:24:49 UTC 2017 - [email protected] + +- Fix pyuno paths wrt bsc#1059720 + +------------------------------------------------------------------- New: ---- gpgme-1.8.0.tar.bz2 libassuan-2.4.3.tar.bz2 libgpg-error-1.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.emhArj/_old 2017-11-14 14:18:36.940569286 +0100 +++ /var/tmp/diff_new_pack.emhArj/_new 2017-11-14 14:18:36.948568994 +0100 @@ -35,11 +35,16 @@ %else %bcond_with firebird %endif +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%bcond_without system_gpgme +%else +%bcond_with system_gpgme +%endif Name: libreoffice Version: 5.4.2.2 Release: 0 Summary: A Free Office Suite (Framework) -License: LGPL-3.0+ AND MPL-2.0+ +License: LGPL-3.0+ and MPL-2.0+ Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz @@ -53,6 +58,10 @@ # used extensions sources Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 +# GPGME bundle list +Source1000: %{external_url}/gpgme-1.8.0.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.26.tar.bz2 +Source1002: %{external_url}/libassuan-2.4.3.tar.bz2 # This never had an release so just bundle it as per what other distros do Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # Internal bundled stuff we can't remove @@ -121,7 +130,11 @@ BuildRequires: libexif BuildRequires: libfonts BuildRequires: libformula +%if %{with system_gpgme} BuildRequires: libgpgmepp-devel +%else +BuildRequires: chrpath +%endif BuildRequires: libjpeg-devel BuildRequires: liblayout BuildRequires: libloader @@ -1029,6 +1042,11 @@ %else --disable-kde4 \ %endif +%if %{with system_gpgme} + --with-system-gpgmepp \ +%else + --without-system-gpgmepp \ +%endif %if %{with firebird} --enable-firebird-sdbc \ %else @@ -1053,21 +1071,12 @@ # no coinormp packages for coinmp # 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 -make verbose=true build-nocheck +make build-nocheck %check # Run tests only on 64b intel as they are resource hogs %ifarch x86_64 make -unset WITH_LANG -# work around flawed accessibility check -export JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" -export OOO_TEST_SOFFICE=path:%{buildroot}%{baseinstdir}/program/soffice -#timeout -k 2m 2h make smoketest.subsequentcheck -# we don't need this anymore -rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar %endif %install @@ -1220,7 +1229,7 @@ # 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 "sys.path.append('%{_libdir}/%{name}/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 @@ -1252,6 +1261,12 @@ # Symlink libreofficekit to libdir ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/liblibreofficekitgtk.so +%if !%{with system_gpgme} +chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgme.so.11 +chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libgpgmepp.so.6 +chrpath --replace '$ORIGIN' %{buildroot}%{_libdir}/%{name}/program/libassuan.so.0 +%endif + # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose mkdir -p %{buildroot}%{python3_sitelib} ++++++ scp2-user-config-suse.diff ++++++ --- /var/tmp/diff_new_pack.emhArj/_old 2017-11-14 14:18:37.148561699 +0100 +++ /var/tmp/diff_new_pack.emhArj/_new 2017-11-14 14:18:37.148561699 +0100 @@ -3,24 +3,24 @@ scp2/source/ooo/common_brand.scp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu -index 8e18ca5..7c0b95d 100644 ---- officecfg/registry/data/org/openoffice/Setup.xcu +Index: officecfg/registry/data/org/openoffice/Setup.xcu +=================================================================== +--- officecfg/registry/data/org/openoffice/Setup.xcu.orig +++ officecfg/registry/data/org/openoffice/Setup.xcu -@@ -788,7 +788,7 @@ +@@ -787,7 +787,7 @@ <value>10</value> </prop> <prop oor:name="VersionIdentifiers"> -- <value oor:separator=",">Libreoffice 3=libreoffice/3,Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> -+ <value oor:separator=",">Libreoffice 3=libreoffice/3-suse,Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> +- <value oor:separator=",">Libreoffice 3=libreoffice/3,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> ++ <value oor:separator=",">Libreoffice 3=libreoffice/3-suse,Openoffice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value> </prop> <node oor:name="MigrationSteps"> <node oor:name="Datasources" oor:op="replace"> -diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp -index 7bbf873..0b235a0 100644 ---- scp2/source/ooo/common_brand.scp +Index: scp2/source/ooo/common_brand.scp +=================================================================== +--- scp2/source/ooo/common_brand.scp.orig +++ scp2/source/ooo/common_brand.scp -@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall +@@ -381,7 +381,7 @@ ProfileItem gid_Brand_Profileitem_Bootst #elif defined MACOSX Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; #else @@ -29,6 +29,3 @@ #endif End --- -1.7.0.1 -
