Tomáš Chvátal 2017-12-20 20:01:15 +00:00 committed by Git OBS Bridge
parent 3add4cbcd7
commit 9e80139c98
7 changed files with 16 additions and 16 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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