diff --git a/0001-disable-failing-test-on-rhel.patch b/0001-disable-failing-test-on-rhel.patch new file mode 100644 index 0000000..9775d58 --- /dev/null +++ b/0001-disable-failing-test-on-rhel.patch @@ -0,0 +1,24 @@ +From 793adaba0568a89a521274d354911b03a7e09161 Mon Sep 17 00:00:00 2001 +From: rpmbuild +Date: Tue, 27 May 2014 20:03:53 +0200 +Subject: [PATCH] disable failing test on rhel + +--- + sc/Module_sc.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk +index 2b82efa..5d92799 100644 +--- a/sc/Module_sc.mk ++++ b/sc/Module_sc.mk +@@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_check_targets,sc,\ + )) + + $(eval $(call gb_Module_add_slowcheck_targets,sc, \ +- CppunitTest_sc_subsequent_filters_test \ + CppunitTest_sc_subsequent_export_test \ + CppunitTest_sc_html_export_test \ + CppunitTest_sc_opencl_test \ +-- +1.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 09e5815..b3028e8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -259,12 +259,15 @@ Requires: %{name}-base = %{epoch}:%{version}-%{release} Requires: %{name}-emailmerge = %{epoch}:%{version}-%{release} # not upstreamed -Patch1: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch +Patch0: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch # not upstreamed -Patch2: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch +Patch1: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch # not upstreamed -Patch3: libreoffice-installfix.patch -%if 0%{?rhel} && 0%{?rhel} < 7 +Patch2: libreoffice-installfix.patch +%if 0%{?rhel} +# not upstreamed +Patch3: 0001-disable-failing-test-on-rhel.patch +%if 0%{?rhel} < 7 # not upstreamed Patch4: libreoffice-rhel6gcj.patch # not upstreamed @@ -274,6 +277,7 @@ Patch6: libreoffice-rhel6langs.patch # not upstreamed Patch7: libreoffice-rhel6glib.patch %endif +%endif # not upstreamed Patch8: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch # not upstreamed