---- libreoffice-5.0.2.1/dbaccess/Module_dbaccess.mk~ 2015-09-05 09:59:15.000000000 +0200
-+++ libreoffice-5.0.2.1/dbaccess/Module_dbaccess.mk 2015-09-17 08:53:09.973934654 +0200
-@@ -39,16 +39,8 @@ $(eval $(call gb_Module_add_check_target
- CppunitTest_dbaccess_empty_stdlib_save \
- CppunitTest_dbaccess_nolib_save \
- CppunitTest_dbaccess_macros_test \
-- $(if $(ENABLE_JAVA), \
-- CppunitTest_dbaccess_RowSetClones) \
- ))
-
--ifeq ($(ENABLE_JAVA),TRUE)
--$(eval $(call gb_Module_add_check_targets,dbaccess,\
-- CppunitTest_dbaccess_hsqldb_test \
--))
--endif
--
- # This runs a suite of performance tests on embedded firebird and HSQLDB.
- # Instructions on running the test can be found in qa/unit/embeddedb_performancetest
-
---- libreoffice-5.3.0.3/dbaccess/Module_dbaccess.mk~ 2017-02-02 13:13:39.000000000 +0100
-+++ libreoffice-5.3.0.3/dbaccess/Module_dbaccess.mk 2017-02-02 14:38:31.994811891 +0100
-@@ -34,12 +34,6 @@ $(eval $(call gb_Module_add_l10n_targets
- UIConfig_dbtdata \
+--- libreoffice-6.0.0.3/dbaccess/Module_dbaccess.mk~ 2018-01-24 21:31:03.000000000 +0100
++++ libreoffice-6.0.0.3/dbaccess/Module_dbaccess.mk 2018-02-02 08:33:38.287577102 +0100
+@@ -32,12 +32,6 @@ $(eval $(call gb_Module_add_l10n_targets
))
+ ifneq ($(OS),IOS)
-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
-$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_firebird_test \
$(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_dialog_save \
CppunitTest_dbaccess_empty_stdlib_save \
-@@ -49,13 +43,6 @@ $(eval $(call gb_Module_add_check_target
-
- # This runs a suite of peformance tests on embedded firebird and HSQLDB.
- # Instructions on running the test can be found in qa/unit/embeddedb_performancetest
--ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
--ifeq ($(ENABLE_JAVA),TRUE)
--$(eval $(call gb_Module_add_check_targets,dbaccess,\
-- CppunitTest_dbaccess_embeddeddb_performancetest \
--))
--endif
--endif
-
- $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
- JunitTest_dbaccess_complex \
-
-14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
- system dependent way) e.g. on the Win@6 tinderbox it always
- crashes
-14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
- the time
-
-diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
-index 25db0b6..14e507c 100644
---- a/toolkit/Module_toolkit.mk
-+++ b/toolkit/Module_toolkit.mk
-@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
- ifneq ($(OOO_JUNIT_JAR),)
- $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
- JunitTest_toolkit_complex \
-- JunitTest_toolkit_unoapi_1 \
-- JunitTest_toolkit_unoapi_2 \
-- JunitTest_toolkit_unoapi_3 \
-- JunitTest_toolkit_unoapi_4 \
- ))
- endif
-+# JunitTest_toolkit_unoapi_1 \
-+# JunitTest_toolkit_unoapi_2 \
-+# JunitTest_toolkit_unoapi_3 \
-+# JunitTest_toolkit_unoapi_4 \
-
- # vim: set noet sw=4 ts=4:
-diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
-index fa1684c..cc8e1a5 100644
---- a/sc/qa/unoapi/sc_1.sce
-+++ b/sc/qa/unoapi/sc_1.sce
-@@ -24,10 +24,3 @@
- # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
- # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
- -o sc.AccessibleEditableTextPara_PreviewCell
---o sc.ScAccessibleCell
--# i91044 -o sc.ScAccessibleCsvCell
--# i91044 -o sc.ScAccessibleCsvGrid
--# i84641 -o sc.ScAccessibleCsvRuler
--# i88330 -o sc.ScAccessibleDocument
--# i91045 -o sc.ScAccessibleDocumentPagePreview
---o sc.ScAccessiblePageHeader
-diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
-index dbfc3e1..d235c5d 100644
---- a/sc/qa/unoapi/sc_2.sce
-+++ b/sc/qa/unoapi/sc_2.sce
-@@ -15,11 +15,6 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
--# fdo#FOO -o sc.ScAccessiblePageHeaderArea
---o sc.ScAccessiblePreviewCell
---o sc.ScAccessiblePreviewHeaderCell
---o sc.ScAccessiblePreviewTable
--# fdo#45337 -o sc.ScAccessibleSpreadsheet
- # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
- # -o sc.ScAnnotationObj
- # -o sc.ScAnnotationShapeObj
-
-20:42 <@vmiklos> _rene_: yes?
-20:43 < _rene_> vmiklos: see the ml. works, but that of course is not a fix for the test :)
-20:43 < _rene_> s/works/lloconv works/
-20:43 < _rene_> vmiklos: and as a test failure is fatal (at least on i386/amd64)..
-20:44 < loircbot> LibreOffice (core) vmiklos * (3 files in 3 dirs): tdf#83300 DOCX import: 'TOC Heading' should not be 'keep with next' by default
-20:44 <@vmiklos> _rene_: thanks for testing. yes, but then my idea that perhaps the part to fix is the testcase, not the real code may be true at the end :)
-20:45 < _rene_> yeah, or how the test is run (deinit?)
-20:45 < _rene_> because it does say OK...
-20:45 < _rene_> and then SIGSEGVs ;)
-20:46 < loircbot> LibreOffice (core) [feature/glyphy] tml * external/glyphy/glyphy-windows.patch.1: Update the GLyphy patch for Windows
-20:48 <@vmiklos> _rene_: aah, actually it may be a real bug then -- IIRC lloconv has some dirty _exit() hack..
-[...]
-11:21 < _rene_> vmiklos: I think I'll revert to non-libmerged to get that test
- fixed for beta1. I don't like having all tests disabled. can
- live with it for a alpha, but...
-11:22 < _rene_> but merged-nonmerged-merged ping-pong is also not ideal ;)
-11:22 < bubli> tml__: No way I do :P
-11:22 < _rene_> especially as I would differentiate from official TDF builds
- with not-libmerged..
-[...]
-11:48 <@vmiklos> _rene_: right, either revert to non-merged or patch/sed out
- that single test for now.
-
-diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
-index 0b2fd4a..ae40d59 100644
---- a/libreofficekit/Module_libreofficekit.mk
-+++ b/libreofficekit/Module_libreofficekit.mk
-@@ -11,9 +11,9 @@ $(eval $(call gb_Module_Module,libreofficekit))
- CppunitTest_libreofficekit_checkapi \
- ))
-
--$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
-- CppunitTest_libreofficekit_tiledrendering \
--))
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
-+# CppunitTest_libreofficekit_tiledrendering \
-+#))
-
- ifneq ($(ENABLE_GTK3),)
- $(eval $(call gb_Module_add_targets,libreofficekit,\
-
-12:18 < _rene_> chris_wot: ping?
-12:18 < chris_wot> heya
-12:18 < chris_wot> you pinged?
-12:19 < _rene_> chris_wot: any news on
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
-12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
-12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not
- gotten any further on that one
-12:22 < chris_wot> I honestly think that for this one just disable the test for
- now
-12:22 < chris_wot> I'll ping the ML
-
-diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-index 54eed4d..78019bd 100644
---- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1103,28 +1103,28 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
- assertXPath(pXmlDoc, "//w:ind", "start", "1418");
- }
-
--DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
--{
-- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-- if (!pXmlDoc)
-- return;
-- // there should be no flipH and flipV attributes in this case
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-- // check rotation angle
-- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-- // check the first few coordinates of the polygon
--#ifndef MACOSX /* Retina-related rounding rountrip error
-- * hard to smooth out due to the use of string compare
-- * instead of number */
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
--#endif
--}
-+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-+//{
-+// xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-+// if (!pXmlDoc)
-+// return;
-+// // there should be no flipH and flipV attributes in this case
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-+// // check rotation angle
-+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-+// // check the first few coordinates of the polygon
-+//#ifndef MACOSX /* Retina-related rounding rountrip error
-+// * hard to smooth out due to the use of string compare
-+// * instead of number */
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-+//#endif
-+//}
-
- #endif
-
-diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
-index 1c3925f..a16f001 100644
---- a/svx/qa/unoapi/svx.sce
-+++ b/svx/qa/unoapi/svx.sce
-@@ -25,7 +25,7 @@
- #i111216 -o svx.AccessiblePresentationGraphicShape
- #i111216 -o svx.AccessiblePresentationOLEShape
- #i85539 -o svx.AccessiblePresentationShape
---o svx.AccessibleShape
-+#-o svx.AccessibleShape
- #i90294 -o svx.GraphicExporter
- -o svx.SvxDrawPage
- #i85501 -o svx.SvxGraphCtrlAccessibleContext
---- libreoffice-5.4.0.3/sd/qa/unit/import-tests.cxx~ 2017-07-25 22:26:39.000000000 +0200
-+++ libreoffice-5.4.0.3/sd/qa/unit/import-tests.cxx 2017-08-16 12:38:25.387040292 +0200
-@@ -166,7 +166,6 @@ public:
+--- libreoffice-6.0.0.3/sd/qa/unit/import-tests.cxx~ 2018-01-24 21:31:03.000000000 +0100
++++ libreoffice-6.0.0.3/sd/qa/unit/import-tests.cxx 2018-02-02 08:36:16.309008496 +0100
+@@ -171,7 +171,6 @@ public:
CPPUNIT_TEST_SUITE(SdImportTest);
CPPUNIT_TEST(testSmoketest);
CPPUNIT_TEST(testN759180);
CPPUNIT_TEST(testN778859);
---- libreoffice-5.4.0.3/chart2/qa/extras/chart2export.cxx~ 2017-07-25 22:26:39.000000000 +0200
-+++ libreoffice-5.4.0.3/chart2/qa/extras/chart2export.cxx 2017-08-16 16:59:35.217262618 +0200
-@@ -102,9 +102,7 @@ public:
- void testAxisCrossBetweenXSLX();
-
- CPPUNIT_TEST_SUITE(Chart2ExportTest);
-- CPPUNIT_TEST(testErrorBarXLSX);
- CPPUNIT_TEST(testTrendline);
-- CPPUNIT_TEST(testTrendlineOOXML);
- CPPUNIT_TEST(testTrendlineXLS);
- CPPUNIT_TEST(testStockChart);
- CPPUNIT_TEST(testBarChart);
-@@ -124,17 +122,13 @@ public:
- CPPUNIT_TEST(testPieChartDataLabels);
- CPPUNIT_TEST(testSeriesIdxOrder);
- CPPUNIT_TEST(testScatterPlotLabels);
-- CPPUNIT_TEST(testErrorBarDataRangeODS);
- CPPUNIT_TEST(testChartCrash);
- CPPUNIT_TEST(testPieChartRotation);
- CPPUNIT_TEST(testEmbeddingsOleObjectGrabBag);
-- CPPUNIT_TEST(testGapWidthXLSX);
- CPPUNIT_TEST(testSmoothedLines);
-- CPPUNIT_TEST(testLabelStringODS);
- CPPUNIT_TEST(testFdo78290LineChartMarkerX);
- CPPUNIT_TEST(testFdo78290ScatterChartMarkerX);
- CPPUNIT_TEST(testFdo78290CombinationChartMarkerX);
-- CPPUNIT_TEST(testAxisNumberFormatODS);
- CPPUNIT_TEST(testDataLabelBordersDOCX);
- CPPUNIT_TEST(testDataLabel3DChartDOCX);
- CPPUNIT_TEST(testDataLabelBarChartDOCX);
---- libreoffice-5.4.0.3/sc/qa/unit/filters-test.cxx~ 2017-07-25 22:26:39.000000000 +0200
-+++ libreoffice-5.4.0.3/sc/qa/unit/filters-test.cxx 2017-08-16 19:12:33.737100515 +0200
-@@ -101,7 +101,6 @@ public:
- CPPUNIT_TEST(testSharedFormulaXLS);
- CPPUNIT_TEST(testSharedFormulaXLSX);
- CPPUNIT_TEST(testSheetNamesXLSX);
-- CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
- CPPUNIT_TEST(testEnhancedProtectionXLS);
- CPPUNIT_TEST(testEnhancedProtectionXLSX);
- CPPUNIT_TEST(testSortWithSharedFormulasODS);
---- libreoffice-5.4.0.3/sd/qa/unit/tiledrendering/tiledrendering.cxx~ 2017-07-25 22:26:39.000000000 +0200
-+++ libreoffice-5.4.0.3/sd/qa/unit/tiledrendering/tiledrendering.cxx 2017-08-16 20:49:17.148902272 +0200
-@@ -132,7 +132,6 @@ public:
- CPPUNIT_TEST(testPostKeyEventInvalidation);
- CPPUNIT_TEST(testTdf103083);
- CPPUNIT_TEST(testTdf104405);
-- CPPUNIT_TEST(testTdf81754);
- CPPUNIT_TEST(testTdf105502);
- CPPUNIT_TEST(testCommentCallbacks);
- CPPUNIT_TEST(testMultiViewInsertDeletePage);
---- libreoffice-5.4.0.3/chart2/qa/extras/PivotChartTest.cxx~ 2017-07-25 22:26:39.000000000 +0200
-+++ libreoffice-5.4.0.3/chart2/qa/extras/PivotChartTest.cxx 2017-08-16 22:22:58.886361236 +0200
-@@ -51,7 +51,6 @@ public:
- void testPivotChartWithDateRowField();
-
- CPPUNIT_TEST_SUITE(PivotChartTest);
-- CPPUNIT_TEST(testRoundtrip);
- CPPUNIT_TEST(testChangePivotTable);
- CPPUNIT_TEST(testPivotChartWithOneColumnField);
- CPPUNIT_TEST(testPivotChartWithOneRowField);
---- libreoffice-5.4.0.3/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx~ 2017-07-25 22:26:39.000000000 +0200
-+++ libreoffice-5.4.0.3/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 2017-08-17 07:05:08.162607823 +0200
-@@ -181,12 +181,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf41542_bo
- CPPUNIT_ASSERT_EQUAL( 3, getPages() );
- }
-
--DECLARE_OOXMLEXPORT_TEST(tdf105490_negativeMargins, "tdf105490_negativeMargins.docx")
--{
-- // negative margins should change to minimal margins, not default margins.
-- CPPUNIT_ASSERT_EQUAL( 1, getPages() );
--}
--
- DECLARE_OOXMLEXPORT_TEST(testTdf104061_tableSectionColumns,"tdf104061_tableSectionColumns.docx")
- {
- CPPUNIT_ASSERT_MESSAGE("There should be two or three pages", getPages() <= 3 );
---- libreoffice-5.4.0.3/unotest/source/cpp/filters-test.cxx~ 2017-07-25 22:26:39.000000000 +0200
-+++ libreoffice-5.4.0.3/unotest/source/cpp/filters-test.cxx 2017-08-19 10:28:58.910334643 +0200
-@@ -152,15 +152,6 @@ void FiltersTest::testDir(const OUString
- SfxFilterFlags nFilterFlags, SotClipboardFormatId nClipboardID,
- unsigned int nFilterVersion, bool bExport)
- {
-- recursiveScan(test::pass, rFilter,
-- rURL + "pass",
-- rUserData, nFilterFlags, nClipboardID, nFilterVersion, bExport);
-- recursiveScan(test::fail, rFilter,
-- rURL + "fail",
-- rUserData, nFilterFlags, nClipboardID, nFilterVersion, bExport);
-- recursiveScan(test::indeterminate, rFilter,
-- rURL + "indeterminate",
-- rUserData, nFilterFlags, nClipboardID, nFilterVersion, bExport);
- }
-
- }
+--- 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);
+ CPPUNIT_TEST(testTdf113790);
+ CPPUNIT_TEST(testTdf114306);
+- CPPUNIT_TEST(testTdf114536);
+ CPPUNIT_TEST_SUITE_END();
+
+ private:
%bcond_with icecream # use icecream to speed up builds
%bcond_with msaccess # with ms access import pieces
%bcond_without parallelbuild # use greater number of jobs to speed up build (default: 1)
+%bcond_with tests
%bcond_without system_beanshell
%bcond_without system_db # without system (i.e. with internal) Berkeley DB
%undefine with_system_hsqldb
%endif
-%define major_ver 5.4.0
+%define major_ver 6.0.0
Summary: LibreOffice - powerful office suite
Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy
License: GPL/LGPL
Group: X11/Applications
Source0: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 3491becc5b7e3b1658239b8be877770c
+# Source0-md5: 36e417cf7f0c2a0a3b6af6d4435b687a
Source1: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: df72048ade4fe7a63a7934af65f2e5bd
+# Source1-md5: 68e0f223d4b82988a1a849382e4d7bcb
Source2: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: c3e731156d2b5594cd3e0dc8c36d7ea3
+# Source2-md5: 021bb9c6f06780b78429bb6240d7c7f7
Source3: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: 18ea9867fea2fd0f9149df43ce286e30
+# Source3-md5: 9dcdf0eb7c072dfe05e68c6f21baeaa8
# make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget
# but not sure if all are needed?
-Source20: http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2
-# Source20-md5: 5e97e37a615314a77f53a08eeb8d8a42
-Source21: http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
-# Source21-md5: 4b87018f7fff1d054939d19920b751a0
-Source22: http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2
-# Source22-md5: 4ca8a6ef0afeefc864e9ef21b9f14bd6
-Source23: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-# Source23-md5: 17410483b5b5f267aa18b7e00b65e6e0
-Source24: http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz
-# Source24-md5: 1cce53bf4b40ae29790d2c5c9f8b1129
-Source25: http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-# Source25-md5: 798b2ffdc8bcfe7bca2cf92b62caf685
-Source26: http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-# Source26-md5: 0168229624cfac409e766913506961a8
+Source20: http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2
+# Source20-md5: a7c08f44c6e2e1d7a71f7073cb9d5786
+Source21: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+# Source21-md5: 17410483b5b5f267aa18b7e00b65e6e0
+Source22: http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz
+# Source22-md5: 1cce53bf4b40ae29790d2c5c9f8b1129
+Source23: http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+# Source23-md5: 798b2ffdc8bcfe7bca2cf92b62caf685
+Source24: http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+# Source24-md5: 0168229624cfac409e766913506961a8
+Source25: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+# Source25-md5: 35c94d2df8893241173de1d16b6034c0
+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
-Source28: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-# Source28-md5: 35c94d2df8893241173de1d16b6034c0
-Source29: http://dev-www.libreoffice.org/src/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
-# Source29-md5: 8249374c274932a21846fa7629c2aa9b
-Source30: http://dev-www.libreoffice.org/src/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
-# Source30-md5: a084cd548b586552cb7d3ee51f1af969
+# Source27-md5: a7983f859eafb2677d7ff386a023bc40
Patch0: disable-failing-test.patch
BuildRequires: cairo-devel >= 1.2.0
%{?with_ccache:BuildRequires: ccache}
BuildRequires: clucene-core-devel >= 2.3
-BuildRequires: cppunit-devel >= 1.12.0
%{?with_system_coinmp:BuildRequires: coinmp-devel}
+BuildRequires: cppunit-devel >= 1.12.0
BuildRequires: cups-devel
BuildRequires: curl-devel >= 7.9.8
%{?with_system_db:BuildRequires: db-devel}
BuildRequires: dbus-glib-devel >= 0.70
-BuildRequires: findutils
BuildRequires: flex
BuildRequires: fontconfig-devel >= 1.0.1
BuildRequires: freetype-devel >= 2.1
BuildRequires: libmspub-devel
BuildRequires: libmwaw-devel >= 0.3.0
BuildRequires: libodfgen-devel >= 0.1.1
-BuildRequires: liborcus-devel >= 0.12.0
+BuildRequires: liborcus-devel >= 0.13.0
BuildRequires: libpagemaker-devel >= 0.0.2
BuildRequires: libstaroffice-devel
BuildRequires: libvisio-devel
%endif
BuildRequires: java-libxml
BuildRequires: java-sac
+%{?with_system_xalan:BuildRequires: java-xalan}
+%{?with_system_xalan:BuildRequires: java-xalan}
BuildRequires: libart_lgpl-devel
BuildRequires: libbonobo-devel >= 2.0
BuildRequires: libcdr-devel >= 0.0.8
BuildRequires: libcmis-devel >= 0.5
-BuildRequires: libgltf-devel >= 0.1.0
+BuildRequires: libepubgen-devel >= 0.1.0
+BuildRequires: libexttextcat-devel
BuildRequires: libgltf-devel < 0.2.0
+BuildRequires: libgltf-devel >= 0.1.0
%{?with_system_libhnj:BuildRequires: libhnj-devel}
BuildRequires: libicu-devel >= 4.0
BuildRequires: libjpeg-devel
+BuildRequires: libqxp-devel
BuildRequires: librsvg-devel >= 2.14
BuildRequires: libsndfile-devel
BuildRequires: libstdc++-devel >= 5:3.2.1
BuildRequires: libsvg-devel >= 0.1.4
-BuildRequires: libexttextcat-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxslt-devel
BuildRequires: libxslt-progs
BuildRequires: perl-base
BuildRequires: perl-devel
BuildRequires: pkgconfig
-BuildRequires: postgresql-devel
BuildRequires: poppler-cpp-devel >= 0.8.0
BuildRequires: poppler-devel >= 0.8.0
BuildRequires: portaudio-devel
+BuildRequires: postgresql-devel
BuildRequires: python3 >= 3.3
BuildRequires: python3-devel >= 3.3
BuildRequires: python3-modules >= 3.3
BuildRequires: unixODBC-devel >= 2.2.12-2
BuildRequires: unzip
BuildRequires: vigra-devel
-%{?with_system_xalan:BuildRequires: java-xalan}
+BuildRequires: xmlsec1-nss-devel >= 1.2.24
BuildRequires: xorg-font-font-adobe-utopia-type1
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXtst-devel
-BuildRequires: xmlsec1-nss-devel >= 1.2.24
BuildRequires: zip >= 3.0
BuildRequires: zlib-devel
%if %{with java}
Requires: %{name}-wiki-publisher = %{version}-%{release}
Requires: %{name}-writer = %{version}-%{release}
Requires: %{name}-xsltfilter = %{version}-%{release}
+Obsoletes: libreoffice-testtools
Obsoletes: openoffice.org
Obsoletes: openoffice.org-testtools
-Obsoletes: libreoffice-testtools
ExclusiveArch: %{ix86} %{x8664} ppc sparc sparcv9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Requires: cups-lib
Requires: fonts-TTF-OpenSymbol
Requires: hicolor-icon-theme
-%{?with_system_beanshell:Requires: java-beanshell}
-%{?with_system_hsqldb:Requires: java-hsqldb}
+%{?with_system_beanshell:Requires: java-beanshell}
+%{?with_system_hsqldb:Requires: java-hsqldb}
Requires: libstdc++ >= 5:3.2.1
Requires: mktemp
Requires: saxon
Requires: sed
-%{?with_system_xalan:Requires: xalan-j}
-#Suggests: chkfontpath
+%{?with_system_xalan:Requires: xalan-j}
+#Suggests: chkfontpath
Obsoletes: libreoffice-binfilter < 4.0.0.0
-Obsoletes: libreoffice-report-builder < 4.1.0.0
-Obsoletes: libreoffice-javafilter < 4.1.0.0
Obsoletes: libreoffice-i18n-kid
Obsoletes: libreoffice-i18n-ku
Obsoletes: libreoffice-i18n-ky
Obsoletes: libreoffice-i18n-sh
Obsoletes: libreoffice-i18n-ti
Obsoletes: libreoffice-i18n-ur
+Obsoletes: libreoffice-javafilter < 4.1.0.0
+Obsoletes: libreoffice-report-builder < 4.1.0.0
Obsoletes: oooqs
Obsoletes: openoffice
Obsoletes: openoffice-i18n-fo
Requires(post,postun): gtk-update-icon-cache
Requires: %{name}-core = %{version}-%{release}
Requires: hicolor-icon-theme
-Obsoletes: openoffice.org-impress
-Obsoletes: libreoffice-presenter-screen < 4.0.0.0-1
Obsoletes: libreoffice-presentation-minimizer < 4.2.0.0
+Obsoletes: libreoffice-presenter-screen < 4.0.0.0-1
+Obsoletes: openoffice.org-impress
%description impress
Presentation application of LibreOffice.
%endif
%description i18n-sid
-This package provides resources containing menus and dialogs in
-Sidama language.
+This package provides resources containing menus and dialogs in Sidama
+language.
%description i18n-sid -l pl.UTF-8
Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
dialogs.
%prep
-%setup -q -n %{name}-%{version} -a1 -a2 -a3
+%setup -q -a1 -a2 -a3
%patch0 -p1
for dir in *-%{version}; do
ln %{SOURCE25} ext_sources
ln %{SOURCE26} ext_sources
ln %{SOURCE27} ext_sources
-ln %{SOURCE28} ext_sources
-ln %{SOURCE29} ext_sources
-ln %{SOURCE30} ext_sources
:> src.downloaded
%build
%{?with_system_libhnj:--with-system-altlinuxhyphen} \
%{?with_msaccess:--with%{!?with_system_mdbtools:out}-system-mdbtools}} \
--enable-python=system \
- --with-external-dict-dir=/usr/share/myspell \
+ --with-external-dict-dir=%{_datadir}/myspell \
--with-external-tar=$(pwd)/ext_sources \
- --with-junit=%{_datadir}/java/junit.jar \
+ --with-junit=%{_javadir}/junit.jar \
--enable-ext-nlpsolver \
--enable-pdfimport \
--enable-ext-wiki-publisher \
# this limits processing some files but doesn't limit parallel build
# processes of main OOo build (since OOo uses it's own build system)
-%{__make} -j1 \
- ARCH_FLAGS="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" \
- ARCH_FLAGS_CC="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" \
- ARCH_FLAGS_CXX="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" \
- ARCH_FLAGS_OPT="$SAFE_CFLAGS"
+export ARCH_FLAGS="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
+export ARCH_FLAGS_CC="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing"
+export ARCH_FLAGS_CXX="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden"
+export ARCH_FLAGS_OPT="$SAFE_CFLAGS"
+
+%{__make} -j1 verbose=true build-nocheck
+
+%if %{with tests}
+%{__make} -j1 verbose=true check
+%endif
%install
+rm -rf $RPM_BUILD_ROOT
# install just once (based on makeinstall.stamp)
# this will make packaging newer versions simplier
if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtdata/popupmenu
%{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtdata/toolbar
%{_datadir}/%{name}/share/registry/base.xcd
-/usr/share/appdata/libreoffice-base.appdata.xml
+%{_datadir}/appdata/libreoffice-base.appdata.xml
%files calc
%defattr(644,root,root,755)
%{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/ui
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/scalc/ui/res/*
%{_datadir}/%{name}/share/registry/calc.xcd
-/usr/share/appdata/libreoffice-calc.appdata.xml
+%{_datadir}/appdata/libreoffice-calc.appdata.xml
%files draw
%defattr(644,root,root,755)
%{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw/ui/res/*
%{_datadir}/%{name}/share/registry/draw.xcd
-/usr/share/appdata/libreoffice-draw.appdata.xml
+%{_datadir}/appdata/libreoffice-draw.appdata.xml
%files emailmerge
%defattr(644,root,root,755)
%{_datadir}/%{name}/share/config/soffice.cfg/writerperfect
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter/ui/res/*
%{_datadir}/%{name}/share/registry/writer.xcd
-/usr/share/appdata/libreoffice-writer.appdata.xml
+%{_datadir}/appdata/libreoffice-writer.appdata.xml
%files impress
%defattr(644,root,root,755)
%exclude %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress/ui/res/*
%{_datadir}/%{name}/share/registry/impress.xcd
%{_datadir}/%{name}/share/registry/ogltrans.xcd
-/usr/share/appdata/libreoffice-impress.appdata.xml
+%{_datadir}/appdata/libreoffice-impress.appdata.xml
%files math
%defattr(644,root,root,755)
%{_datadir}/%{name}/share/Scripts/python
%files pdfimport
+%defattr(644,root,root,755)
# -f pdfimport.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/program/xpdfimport
%files -n bash-completion-%{name}
%defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/%{name}.sh
+%{bash_compdir}/%{name}.sh
%files glade
+%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/program/ui-previewer
%dir %{_datadir}/%{name}/share/glade
%{_datadir}/%{name}/share/glade/libreoffice-catalog.xml
projects / packages / libreoffice.git / commitdiff