From c8a19ed6af4f22bd84df91f3a57b1094f4843608a6d59169afe2c49eed3d386c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 15 Jan 2018 09:55:29 +0000 Subject: [PATCH 1/7] - Add requires on kdelibs4 to avoid crashes OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=577 --- libreoffice.changes | 5 +++++ libreoffice.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 0f438cf..f041c44 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 695e7d1..81b2bd8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -528,6 +528,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 From 698c279b455b226f4de6421d2d36fa45af52273371384f4b3283046fbc737c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 15 Jan 2018 18:51:33 +0000 Subject: [PATCH 2/7] - Version update to 6.0.0.2: * More fixes in RC2 of 6.0.0 release OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=578 --- libreoffice-6.0.0.1.tar.xz | 3 --- libreoffice-6.0.0.2.tar.xz | 3 +++ libreoffice-help-6.0.0.1.tar.xz | 3 --- libreoffice-help-6.0.0.2.tar.xz | 3 +++ libreoffice-translations-6.0.0.1.tar.xz | 3 --- libreoffice-translations-6.0.0.2.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 4 +--- 8 files changed, 16 insertions(+), 12 deletions(-) delete mode 100644 libreoffice-6.0.0.1.tar.xz create mode 100644 libreoffice-6.0.0.2.tar.xz delete mode 100644 libreoffice-help-6.0.0.1.tar.xz create mode 100644 libreoffice-help-6.0.0.2.tar.xz delete mode 100644 libreoffice-translations-6.0.0.1.tar.xz create mode 100644 libreoffice-translations-6.0.0.2.tar.xz diff --git a/libreoffice-6.0.0.1.tar.xz b/libreoffice-6.0.0.1.tar.xz deleted file mode 100644 index 455a487..0000000 --- a/libreoffice-6.0.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71e82c59b5659d60cc97eb32c6e2e22a80621cfc166f148fd1b3e50ec0d4f485 -size 203038960 diff --git a/libreoffice-6.0.0.2.tar.xz b/libreoffice-6.0.0.2.tar.xz new file mode 100644 index 0000000..7ac45ae --- /dev/null +++ b/libreoffice-6.0.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7177fd6d6652191bc632f4b51efed6804c837503a1583bc99a4bec2e6d6effc2 +size 203600324 diff --git a/libreoffice-help-6.0.0.1.tar.xz b/libreoffice-help-6.0.0.1.tar.xz deleted file mode 100644 index 3abe2af..0000000 --- a/libreoffice-help-6.0.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c4990a7c942d15610f451df8e2ade7e450ab9fe745e0244bff6a266b77d3e5c -size 2972096 diff --git a/libreoffice-help-6.0.0.2.tar.xz b/libreoffice-help-6.0.0.2.tar.xz new file mode 100644 index 0000000..9766cae --- /dev/null +++ b/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 diff --git a/libreoffice-translations-6.0.0.1.tar.xz b/libreoffice-translations-6.0.0.1.tar.xz deleted file mode 100644 index 06004d2..0000000 --- a/libreoffice-translations-6.0.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a4a07040ef5223807a0504ae09349f5350cb689daedae08fb68469822ce0101 -size 138936212 diff --git a/libreoffice-translations-6.0.0.2.tar.xz b/libreoffice-translations-6.0.0.2.tar.xz new file mode 100644 index 0000000..cef2523 --- /dev/null +++ b/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 diff --git a/libreoffice.changes b/libreoffice.changes index f041c44..5084f3e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 81b2bd8..b4f24ed 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ %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+ @@ -895,8 +895,6 @@ 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 -sed -i -e /CppunitTest_sw_rtfimport/d sw/Module_sw.mk # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile From 2d6bd7dc38e9666d0b496b20745f322f146a0334ab281f8ce944ec2d8fec35c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 16 Jan 2018 10:37:13 +0000 Subject: [PATCH 3/7] - Fix the lo-provides filtering to allow proper provides to be generated OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=579 --- libreoffice.changes | 5 +++++ lo-provides | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 5084f3e..2eab083 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/lo-provides b/lo-provides index e43c126..c918422 100644 --- a/lo-provides +++ b/lo-provides @@ -3,4 +3,4 @@ grep -v -e libgpgme.so \ -e libgpgmepp.so \ -e libassuan.so \ -e libgpg-error.so \ - | /usr/lib/rpm/find-provides “$@” + | /usr/lib/rpm/find-provides From c615ee1656bb979a0fbc3ccab577958a77029aa2fd04e94c8ea6146b75a84e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 Jan 2018 10:39:40 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=580 --- libreoffice.spec | 7 ++----- lo-provides | 6 ------ lo-requires | 6 ------ 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 lo-provides delete mode 100644 lo-requires diff --git a/libreoffice.spec b/libreoffice.spec index b4f24ed..b7ce9ec 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -40,9 +40,8 @@ %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/lib{gpg,assuan}*\\.pc$ +%global __requires_exclude_from ^%{_libdir}/libreoffice/lib{gpg,assuan}*\\.pc$ %bcond_with system_gpgme %endif Name: libreoffice @@ -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 diff --git a/lo-provides b/lo-provides deleted file mode 100644 index c918422..0000000 --- a/lo-provides +++ /dev/null @@ -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 diff --git a/lo-requires b/lo-requires deleted file mode 100644 index 22be3ea..0000000 --- a/lo-requires +++ /dev/null @@ -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 From d82c16759bb128be9e30d0b20bf701ac5d9e3bb95018c1bca09eaeba64b6f387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 Jan 2018 10:43:54 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=581 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index b7ce9ec..58ebca5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -40,8 +40,8 @@ %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages -%global __provides_exclude_from ^%{_libdir}/libreoffice/lib{gpg,assuan}*\\.pc$ -%global __requires_exclude_from ^%{_libdir}/libreoffice/lib{gpg,assuan}*\\.pc$ +%global __provides_exclude_from ^%{_libdir}/libreoffice/lib(gpg|assuan).*\\.so.*$ +%global __requires_exclude_from ^%{_libdir}/libreoffice/lib(gpg|assuan).*\\.so.*$ %bcond_with system_gpgme %endif Name: libreoffice From fe96320efd1a181b2672dfff1adaf121ee020f0b6a70feb22ce851ca96edf8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 Jan 2018 19:29:30 +0000 Subject: [PATCH 6/7] - Disable 2 db tests that are really flaky in OBS OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=582 --- libreoffice.changes | 5 +++++ libreoffice.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 2eab083..f6b7565 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 58ebca5..9f5ead6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -40,8 +40,8 @@ %else # Hack in the bundled libs to not pop up on requires/provides to avoid # faking libreoffice provide some system packages -%global __provides_exclude_from ^%{_libdir}/libreoffice/lib(gpg|assuan).*\\.so.*$ -%global __requires_exclude_from ^%{_libdir}/libreoffice/lib(gpg|assuan).*\\.so.*$ +%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 @@ -892,6 +892,9 @@ 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 +# 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 # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile From 36cf473aff3e87b8ec190b52ecad9301dd0d2ac714c03330f78c1dd00107ba20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 18 Jan 2018 12:08:40 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=583 --- libreoffice.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 9f5ead6..be92275 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -895,6 +895,8 @@ sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk # 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 echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile