From 9e80139c98884ae35e6eaa4fab051587eac18eb2a91fd81ee3956d5424279312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 20 Dec 2017 20:01:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=569 --- libreoffice-6.0.0.0.beta2.tar.xz | 3 --- libreoffice-6.0.0.1.tar.xz | 3 +++ libreoffice-help-6.0.0.0.beta2.tar.xz | 3 --- libreoffice-help-6.0.0.1.tar.xz | 3 +++ libreoffice-translations-6.0.0.0.beta2.tar.xz | 3 --- libreoffice-translations-6.0.0.1.tar.xz | 3 +++ libreoffice.spec | 14 +++++++------- 7 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 libreoffice-6.0.0.0.beta2.tar.xz create mode 100644 libreoffice-6.0.0.1.tar.xz delete mode 100644 libreoffice-help-6.0.0.0.beta2.tar.xz create mode 100644 libreoffice-help-6.0.0.1.tar.xz delete mode 100644 libreoffice-translations-6.0.0.0.beta2.tar.xz create mode 100644 libreoffice-translations-6.0.0.1.tar.xz diff --git a/libreoffice-6.0.0.0.beta2.tar.xz b/libreoffice-6.0.0.0.beta2.tar.xz deleted file mode 100644 index b9567b7..0000000 --- a/libreoffice-6.0.0.0.beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9488fb08f211dcf7e2fe2ec46139e3ffe6d372d8dcacdf7cf976c5cb3fbb182a -size 203422696 diff --git a/libreoffice-6.0.0.1.tar.xz b/libreoffice-6.0.0.1.tar.xz new file mode 100644 index 0000000..455a487 --- /dev/null +++ b/libreoffice-6.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71e82c59b5659d60cc97eb32c6e2e22a80621cfc166f148fd1b3e50ec0d4f485 +size 203038960 diff --git a/libreoffice-help-6.0.0.0.beta2.tar.xz b/libreoffice-help-6.0.0.0.beta2.tar.xz deleted file mode 100644 index 0b19e82..0000000 --- a/libreoffice-help-6.0.0.0.beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02ad6505fffbaa8a4065a10424cd8dcfc1bec1f2ae12f22b918a7076fb0cd46e -size 2640096 diff --git a/libreoffice-help-6.0.0.1.tar.xz b/libreoffice-help-6.0.0.1.tar.xz new file mode 100644 index 0000000..3abe2af --- /dev/null +++ b/libreoffice-help-6.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c4990a7c942d15610f451df8e2ade7e450ab9fe745e0244bff6a266b77d3e5c +size 2972096 diff --git a/libreoffice-translations-6.0.0.0.beta2.tar.xz b/libreoffice-translations-6.0.0.0.beta2.tar.xz deleted file mode 100644 index 5ca7ddd..0000000 --- a/libreoffice-translations-6.0.0.0.beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6699627ebda722f3036a5cd76615c74bbee619e1d86ea6d69eb147b771d9245c -size 134909992 diff --git a/libreoffice-translations-6.0.0.1.tar.xz b/libreoffice-translations-6.0.0.1.tar.xz new file mode 100644 index 0000000..06004d2 --- /dev/null +++ b/libreoffice-translations-6.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a4a07040ef5223807a0504ae09349f5350cb689daedae08fb68469822ce0101 +size 138936212 diff --git a/libreoffice.spec b/libreoffice.spec index 79def54..7f0c24a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -24,8 +24,8 @@ %define external_url http://dev-www.libreoffice.org/src/ #%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.0 %define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/ -# Wether to enable the kde integration -%if 0%{?is_opensuse} && 0%{?suse_version} < 1500 +# Enable the kde integration on openSUSE only +%if 0%{?is_opensuse} %bcond_without kdeintegration %else %bcond_with kdeintegration @@ -46,7 +46,7 @@ %bcond_with system_gpgme %endif Name: libreoffice -Version: 6.0.0.0.beta2 +Version: 6.0.0.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0+ and MPL-2.0+ @@ -184,7 +184,7 @@ BuildRequires: pkgconfig(libclucene-core) BuildRequires: pkgconfig(libcmis-0.5) >= 0.5.0 BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1 BuildRequires: pkgconfig(libeot) >= 0.01 -BuildRequires: pkgconfig(libepubgen-0.0) +BuildRequires: pkgconfig(libepubgen-0.1) BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.7 BuildRequires: pkgconfig(libexttextcat) >= 3.1.1 BuildRequires: pkgconfig(libfreehand-0.1) @@ -897,9 +897,9 @@ sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk %endif # ww8 export and ooxml export tests are borked, upstream knows, test when # updating the version, same for the rtfimport -sed -i -e /CppunitTest_sw_ww8export/d sw/Module_sw.mk -sed -i -e /CppunitTest_sw_ooxmlexport4/d sw/Module_sw.mk -sed -i -e /CppunitTest_sw_rtfimport/d sw/Module_sw.mk +#sed -i -e /CppunitTest_sw_ww8export/d sw/Module_sw.mk +#sed -i -e /CppunitTest_sw_ooxmlexport4/d sw/Module_sw.mk +#sed -i -e /CppunitTest_sw_rtfimport/d sw/Module_sw.mk # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile