diff --git a/0001-disable-failing-check.patch b/0001-disable-failing-check.patch deleted file mode 100644 index b016d21..0000000 --- a/0001-disable-failing-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk -index 6280984..ffafa6b 100644 ---- a/sw/Module_sw.mk -+++ b/sw/Module_sw.mk -@@ -55,7 +55,6 @@ - CppunitTest_sw_htmlexport \ - CppunitTest_sw_macros_test \ - CppunitTest_sw_ooxmlexport \ -- CppunitTest_sw_ooxmlimport \ - CppunitTest_sw_ww8export \ - CppunitTest_sw_ww8import \ - CppunitTest_sw_rtfexport \ diff --git a/0001-disable-sw-import-export-tests.patch b/0001-disable-sw-import-export-tests.patch new file mode 100644 index 0000000..2798d49 --- /dev/null +++ b/0001-disable-sw-import-export-tests.patch @@ -0,0 +1,38 @@ +From 9db523cf91d7d45ac509792b9d4e241fb3ff95f7 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Sun, 16 Jun 2013 07:53:25 +0200 +Subject: [PATCH] disable sw import/export tests + +Most of them fails for unclear (yet) reasons on ppc/s390 (big endian +issue?) This is the last chance to get something that builds before the +F-19 final freeze. + +Change-Id: I4b15da3f444d59aaf3bb3023e83dbf9bc2efd9fe +--- + sw/Module_sw.mk | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk +index 202c67c..04ad5fa 100644 +--- a/sw/Module_sw.mk ++++ b/sw/Module_sw.mk +@@ -46,16 +46,7 @@ $(eval $(call gb_Module_add_check_targets,sw,\ + )) + + $(eval $(call gb_Module_add_slowcheck_targets,sw,\ +- CppunitTest_sw_htmlexport \ + CppunitTest_sw_macros_test \ +- CppunitTest_sw_ooxmlexport \ +- CppunitTest_sw_ooxmlimport \ +- CppunitTest_sw_ww8export \ +- CppunitTest_sw_ww8import \ +- CppunitTest_sw_rtfexport \ +- CppunitTest_sw_rtfimport \ +- CppunitTest_sw_odfexport \ +- CppunitTest_sw_odfimport \ + )) + + ifneq ($(DISABLE_CVE_TESTS),TRUE) +-- +1.8.2.1 + diff --git a/libreoffice.spec b/libreoffice.spec index f4597dc..c075ef9 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.0 -Release: 8%{?libo_prerelease}%{?dist} +Release: 9%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -235,7 +235,7 @@ Patch5: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch Patch7: libreoffice-installfix.patch #to-do, fix this on bigendian platforms -Patch8: 0001-disable-failing-check.patch +Patch8: 0001-disable-sw-import-export-tests.patch %if 0%{?rhel} && 0%{?rhel} < 7 Patch9: libreoffice-rhel6gcj.patch Patch10: libreoffice-rhel6poppler.patch @@ -2058,6 +2058,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Sun Jun 16 2013 David Tardon - 1:4.1.0.0-9.beta2 +- Resolves: rhbz#971321 failing tests on ppc and s390 + * Fri Jun 07 2013 David Tardon - 1:4.1.0.0-8.beta2 - Related: rhbz#971795 go back to BR: harfbuzz-devel