dtardon pushed to libreoffice (f22). "this is not needed anymore"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Mar 30 07:34:42 UTC 2015
>From 91c032e333fd2cbe2b6369f53f7f71cfb550fda9 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Fri, 20 Mar 2015 10:12:44 +0100
Subject: this is not needed anymore
diff --git a/0001-disable-swui-test-on-RHEL-7.patch b/0001-disable-swui-test-on-RHEL-7.patch
deleted file mode 100644
index 1cb5d46..0000000
--- a/0001-disable-swui-test-on-RHEL-7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 857152e54d3c969a7b0056d71bbb6f9f6eeec347 Mon Sep 17 00:00:00 2001
-From: rpmbuild <rpmbuild at fedoraproject.org>
-Date: Fri, 30 May 2014 09:15:36 +0200
-Subject: [PATCH] disable swui test on RHEL-7
-
----
- sw/Module_sw.mk | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
-index 53a19bb..6702d9f 100644
---- a/sw/Module_sw.mk
-+++ b/sw/Module_sw.mk
-@@ -47,7 +47,6 @@ $(eval $(call gb_Module_add_targets,sw,\
- endif
-
- $(eval $(call gb_Module_add_slowcheck_targets,sw,\
-- CppunitTest_sw_uwriter \
- CppunitTest_sw_htmlexport \
- CppunitTest_sw_htmlimport \
- CppunitTest_sw_macros_test \
-@@ -60,7 +59,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
- CppunitTest_sw_rtfimport \
- CppunitTest_sw_odfexport \
- CppunitTest_sw_odfimport \
-- CppunitTest_sw_uiwriter \
- CppunitTest_sw_mailmerge \
- CppunitTest_sw_globalfilter \
- ))
---
-1.9.3
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 6e9db57..37d3c1b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -306,9 +306,6 @@ Patch7: libreoffice-rhel6glib.patch
Patch8: 0001-disable-failing-test-on-rhel-6.patch
%endif
# not upstreamed
-# TODO: fails on ppc; investigate
-Patch9: 0001-disable-swui-test-on-RHEL-7.patch
-# not upstreamed
Patch10: 0001-disable-libe-book-support.patch
%else
Patch11: 0001-disable-failing-while-libmwaw-fix-pending.patch
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f22&id=91c032e333fd2cbe2b6369f53f7f71cfb550fda9
More information about the scm-commits
mailing list