Accepting request 567405 from LibreOffice:Factory

- Disable 2 db tests that are really flaky in OBS

- Fix the lo-provides filtering to allow proper provides to be generated

- Version update to 6.0.0.2:
  * More fixes in RC2 of 6.0.0 release

- Add requires on kdelibs4 to avoid crashes

OBS-URL: https://build.opensuse.org/request/show/567405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=143

libreoffice-6.0.0.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71e82c59b5659d60cc97eb32c6e2e22a80621cfc166f148fd1b3e50ec0d4f485
-size 203038960

libreoffice-6.0.0.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7177fd6d6652191bc632f4b51efed6804c837503a1583bc99a4bec2e6d6effc2
+size 203600324

libreoffice-help-6.0.0.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c4990a7c942d15610f451df8e2ade7e450ab9fe745e0244bff6a266b77d3e5c
-size 2972096

libreoffice-help-6.0.0.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e8b73f4ff00e0db3ff19db421ce0107ede8b0c8913036ac7ebb4747d00595598
+size 2989596

libreoffice-translations-6.0.0.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a4a07040ef5223807a0504ae09349f5350cb689daedae08fb68469822ce0101
-size 138936212

libreoffice-translations-6.0.0.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1eae40d331ae0e7130e3bd8fbc717cf48be3ea6ca9865fb85b4596c97abef1f
+size 139509364

libreoffice.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Jan 17 19:29:11 UTC 2018 - tchvatal@suse.com
+
+- Disable 2 db tests that are really flaky in OBS
+
+-------------------------------------------------------------------
+Tue Jan 16 09:56:39 UTC 2018 - tchvatal@suse.com
+
+- Fix the lo-provides filtering to allow proper provides to be generated
+
+-------------------------------------------------------------------
+Mon Jan 15 18:45:31 UTC 2018 - tchvatal@suse.com
+
+- Version update to 6.0.0.2:
+  * More fixes in RC2 of 6.0.0 release
+
+-------------------------------------------------------------------
+Mon Jan 15 09:55:10 UTC 2018 - tchvatal@suse.com
+
+- Add requires on kdelibs4 to avoid crashes
+
 -------------------------------------------------------------------
 Thu Jan  4 21:30:45 UTC 2018 - dimstar@opensuse.org
 

libreoffice.spec

@@ -40,13 +40,12 @@
 %else
 # Hack in the bundled libs to not pop up on requires/provides to avoid
 # faking libreoffice provide some system packages
-%define _use_internal_dependency_generator 0
-%define __find_provides /bin/sh %_sourcedir/lo-provides %name
-%define __find_requires /bin/sh %_sourcedir/lo-requires %name
+%global __provides_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$
+%global __requires_exclude_from ^%{_libdir}/libreoffice/program/lib(gpg|assuan).*\\.so.*$
 %bcond_with system_gpgme
 %endif
 Name:           libreoffice
-Version:        6.0.0.1
+Version:        6.0.0.2
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0+ and MPL-2.0+
@@ -64,8 +63,6 @@ Source402:      %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{nu
 Source450:      %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
 Source452:      %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 # GPGME bundle list
-Source998:      lo-provides
-Source999:      lo-requires
 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
@@ -528,6 +525,8 @@ This package contains Gtk2 interface rendering option for LibreOffice.
 Summary:        kde4 interface for LibreOffice
 Group:          Productivity/Office/Suite
 Requires:       %{name} = %{version}
+# we need full kdelibs4 otherwise we will crash
+Requires:       kdelibs4
 Supplements:    packageand(libreoffice:plasma5-workspace)
 
 %description kde4
@@ -893,7 +892,10 @@ Provides additional %{langname} translations and resources for %{project}. \
 %if 0%{?suse_version} < 1330
 sed -i -e '/CppunitTest_desktop_lib/d'  desktop/Module_desktop.mk
 %endif
-# Temporary disable as it fails on the RCs
+# Following two tests are really flaky
+sed -i -e /CppunitTest_dbaccess_hsqldb_test/d dbaccess/Module_dbaccess.mk
+sed -i -e s/CppunitTest_dbaccess_RowSetClones// dbaccess/Module_dbaccess.mk
+# Fails due to diff caused by fonts
 sed -i -e /CppunitTest_sw_rtfimport/d sw/Module_sw.mk
 
 # Do not generate doxygen timestamp

lo-provides

@@ -1,6 +0,0 @@
-# hide some private libraries from provides
-grep -v -e libgpgme.so \
-        -e libgpgmepp.so \
-        -e libassuan.so \
-        -e libgpg-error.so \
-        | /usr/lib/rpm/find-provides “$@”

lo-requires

@@ -1,6 +0,0 @@
-# do not require some internal libraries
-/usr/lib/rpm/find-requires “$@” | \
-grep -v -e libgpgme.so \
-        -e libgpgmepp.so \
-        -e libassuan.so \
-        -e libgpg-error.so