commit b1c72e99eb2379cf20867e1e4dc39c9ddd98773d
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu May 24 12:39:04 2018 +0200
- up to 6.0.4.2
disable-failing-test.patch | 9 +++++----
libreoffice.spec | 16 ++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 1ea93ca..b4d3ebe 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -45,23 +45,23 @@
%undefine with_system_hsqldb
%endif
-%define major_ver 6.0.0
+%define major_ver 6.0.4
Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
Name: libreoffice
-Version: %{major_ver}.3
+Version: %{major_ver}.2
Release: 1
License: GPL/LGPL
Group: X11/Applications
Source0:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 36e417cf7f0c2a0a3b6af6d4435b687a
+# Source0-md5: 35cf97f2a9bd8fc173fc75b05e38bf29
Source1:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: 68e0f223d4b82988a1a849382e4d7bcb
+# Source1-md5: 141cba04584b87f4bf77adf54293818c
Source2:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 021bb9c6f06780b78429bb6240d7c7f7
+# Source2-md5: 0dd519a43ad53d0dbfcabbbebbd9ec2a
Source3:
http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: 9dcdf0eb7c072dfe05e68c6f21baeaa8
+# Source3-md5: 8677d98f37ea964f9e5bdc7b83e9b9ff
# make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget
@@ -81,7 +81,7 @@ Source25:
http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-sw
Source26:
https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar
# Source26-md5: f430ee376fea2bee62c8510d8b94e813
Source27:
http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-# Source27-md5: a7983f859eafb2677d7ff386a023bc40
+# Source27-md5: a7983f859eafb2677d7ff386a023bc40
Patch0: disable-failing-test.patch
@@ -148,7 +148,7 @@ BuildRequires: liblangtag-devel
BuildRequires: libmspub-devel
BuildRequires: libmwaw-devel >= 0.3.0
BuildRequires: libodfgen-devel >= 0.1.1
-BuildRequires: liborcus-devel >= 0.13.0
+BuildRequires: liborcus-devel >= 0.13.3
BuildRequires: libpagemaker-devel >= 0.0.2
BuildRequires: libstaroffice-devel
BuildRequires: libvisio-devel
diff --git a/disable-failing-test.patch b/disable-failing-test.patch
index bc00403..bd265d8 100644
--- a/disable-failing-test.patch
+++ b/disable-failing-test.patch
@@ -25,11 +25,12 @@
CPPUNIT_TEST(testN778859);
--- libreoffice-6.0.0.3/sw/qa/extras/uiwriter/uiwriter.cxx~ 2018-01-24
21:31:03.000000000 +0100
+++ libreoffice-6.0.0.3/sw/qa/extras/uiwriter/uiwriter.cxx 2018-02-02
08:41:59.126211831 +0100
-@@ -458,7 +458,6 @@ public:
- CPPUNIT_TEST(testTdf99689TableOfTables);
+@@ -480,7 +480,6 @@ public:
CPPUNIT_TEST(testTdf113790);
CPPUNIT_TEST(testTdf114306);
+ CPPUNIT_TEST(testTdf114306_2);
- CPPUNIT_TEST(testTdf114536);
+ CPPUNIT_TEST(testTdf115065);
+ CPPUNIT_TEST(testTdf115013);
CPPUNIT_TEST_SUITE_END();
-
- private:
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libreoffice.git/commitdiff/b1c72e99eb2379cf20867e1e4dc39c9ddd98773d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
