[libreoffice] disable failing test on RHEL-6

David Tardon dtardon at fedoraproject.org
Sat May 31 08:20:30 UTC 2014


commit 18d8d86ed6dd10008496a7e12b78c310a8daf507
Author: David Tardon <dtardon at redhat.com>
Date:   Sat May 31 10:20:25 2014 +0200

    disable failing test on RHEL-6

 0001-disable-failing-test-on-rhel-6.patch |   24 ++++++++
 libreoffice.spec                          |   82 +++++++++++++++--------------
 2 files changed, 66 insertions(+), 40 deletions(-)
---
diff --git a/0001-disable-failing-test-on-rhel-6.patch b/0001-disable-failing-test-on-rhel-6.patch
new file mode 100644
index 0000000..07c0e42
--- /dev/null
+++ b/0001-disable-failing-test-on-rhel-6.patch
@@ -0,0 +1,24 @@
+From 61deda9f7191e14e54be1b79a721ca73f42d5574 Mon Sep 17 00:00:00 2001
+From: rpmbuild <rpmbuild at fedoraproject.org>
+Date: Sat, 31 May 2014 10:19:14 +0200
+Subject: [PATCH] disable failing test on rhel-6
+
+---
+ dbaccess/Module_dbaccess.mk | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
+index 824f3f5..3214658 100644
+--- a/dbaccess/Module_dbaccess.mk
++++ b/dbaccess/Module_dbaccess.mk
+@@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
+ 
+ ifeq ($(ENABLE_JAVA),TRUE)
+ $(eval $(call gb_Module_add_check_targets,dbaccess,\
+-    CppunitTest_dbaccess_hsqldb_test \
+ ))
+ endif
+ 
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 2d07f0f..f78182c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -282,55 +282,57 @@ Patch7: libreoffice-rhel6glib.patch
 Patch8: 0001-Revert-resolve-crashes-with-ICU-53.1-in-locales-with.patch
 # reverted upstream commit
 Patch9: 0002-upgrade-to-ICU-53.1-fdo-77071-related.patch
+# not upstreamed
+Patch10: 0001-disable-failing-test-on-rhel-6.patch
 %endif
 # not upstreamed
 # TODO: fails on ppc; investigate
-Patch10: 0001-disable-swui-test-on-RHEL-7.patch
+Patch11: 0001-disable-swui-test-on-RHEL-7.patch
 %endif
 # not upstreamed
-Patch11: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
+Patch12: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
 # not upstreamed
-Patch12: 0001-disable-firebird-unit-test.patch
+Patch13: 0001-disable-firebird-unit-test.patch
 # not upstreamed
-Patch13: 0001-never-run-autogen.sh.patch
+Patch14: 0001-never-run-autogen.sh.patch
 # not upstreamed
-Patch14: 0001-add-X-TryExec-entries-to-desktop-files.patch
+Patch15: 0001-add-X-TryExec-entries-to-desktop-files.patch
 # not upstreamed
-Patch15: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
-Patch16: 0001-build-libodfgen-as-shared-lib.patch
-Patch17: 0002-bundle-librevenge.patch
-Patch18: 0003-the-other-way-around.patch
-Patch19: 0004-fix-deps-for-projects-using-librevenge.patch
-Patch20: 0005-always-provide-REDLAND_CFLAGS-LIBS-to-ext.-projects.patch
-Patch21: 0006-rebase-all-import-libs.patch
-Patch22: 0007-libwpd-stream-does-not-exist-anymore.patch
-Patch23: 0008-export-SYSTEM_REVENGE.patch
-Patch24: 0009-drop-trailing-comma.patch
-Patch25: 0001-improve-WPXSvInputStream-test.patch
-Patch26: 0002-enable-new-handlers.patch
-Patch27: 0003-Add-new-libmwaw-drawing-format.patch
-Patch28: 0004-add-new-libmwaw-drawing-formats-forgotten-files.patch
-Patch29: 0005-organize-the-test-data-files-by-test.patch
-Patch30: 0006-fix-return-value-for-libe-book-import-filter.patch
-Patch31: 0007-parse-zipped-FictionBook-2-files-again.patch
-Patch32: 0008-re-enable-libe-book-integration-test.patch
-Patch33: 0009-use-the-right-XML-import-service.patch
-Patch34: 0010-Try-to-add-support-for-WKS-WDB-files.patch
-Patch35: 0011-Make-the-wdb-wks-and-GreatWorks-draw-work.patch
-Patch36: 0012-add-writerperfect-calc-integration-test.patch
-Patch37: 0013-Add-new-libmwaw-s-database-spreadsheet-formats.patch
-Patch38: 0014-fix-detection-of-Keynote-3-documents.patch
-Patch39: 0015-enable-integration-test-for-libmwaw-calc-import.patch
-Patch40: 0016-enable-integration-test-for-libmwaw-draw-import.patch
-Patch41: 0017-these-formats-are-supported-by-libmwaw-0.3.x.patch
-Patch42: 0018-fix-copypasta.patch
-Patch43: 0001-deb-749592-mysql-connector-doesn-t-work-with-remote-.patch
-Patch44: 0001-only-def-graphite-external-if-enable-graphite.patch
-Patch45: 0001-fix-creation-of-substreams-for-OLE2.patch
-Patch46: 0002-generalize-this-for-Zip-too.patch
-Patch47: 0003-reading-from-a-stream-must-start-at-the-beginning.patch
-Patch48: 0004-fix-filter-names.patch
-Patch49: 0005-add-dummy-extension.patch
+Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch
+Patch17: 0001-build-libodfgen-as-shared-lib.patch
+Patch18: 0002-bundle-librevenge.patch
+Patch19: 0003-the-other-way-around.patch
+Patch20: 0004-fix-deps-for-projects-using-librevenge.patch
+Patch21: 0005-always-provide-REDLAND_CFLAGS-LIBS-to-ext.-projects.patch
+Patch22: 0006-rebase-all-import-libs.patch
+Patch23: 0007-libwpd-stream-does-not-exist-anymore.patch
+Patch24: 0008-export-SYSTEM_REVENGE.patch
+Patch25: 0009-drop-trailing-comma.patch
+Patch26: 0001-improve-WPXSvInputStream-test.patch
+Patch27: 0002-enable-new-handlers.patch
+Patch28: 0003-Add-new-libmwaw-drawing-format.patch
+Patch29: 0004-add-new-libmwaw-drawing-formats-forgotten-files.patch
+Patch30: 0005-organize-the-test-data-files-by-test.patch
+Patch31: 0006-fix-return-value-for-libe-book-import-filter.patch
+Patch32: 0007-parse-zipped-FictionBook-2-files-again.patch
+Patch33: 0008-re-enable-libe-book-integration-test.patch
+Patch34: 0009-use-the-right-XML-import-service.patch
+Patch35: 0010-Try-to-add-support-for-WKS-WDB-files.patch
+Patch36: 0011-Make-the-wdb-wks-and-GreatWorks-draw-work.patch
+Patch37: 0012-add-writerperfect-calc-integration-test.patch
+Patch38: 0013-Add-new-libmwaw-s-database-spreadsheet-formats.patch
+Patch39: 0014-fix-detection-of-Keynote-3-documents.patch
+Patch40: 0015-enable-integration-test-for-libmwaw-calc-import.patch
+Patch41: 0016-enable-integration-test-for-libmwaw-draw-import.patch
+Patch42: 0017-these-formats-are-supported-by-libmwaw-0.3.x.patch
+Patch43: 0018-fix-copypasta.patch
+Patch44: 0001-deb-749592-mysql-connector-doesn-t-work-with-remote-.patch
+Patch45: 0001-only-def-graphite-external-if-enable-graphite.patch
+Patch46: 0001-fix-creation-of-substreams-for-OLE2.patch
+Patch47: 0002-generalize-this-for-Zip-too.patch
+Patch48: 0003-reading-from-a-stream-must-start-at-the-beginning.patch
+Patch49: 0004-fix-filter-names.patch
+Patch50: 0005-add-dummy-extension.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice


More information about the scm-commits mailing list