rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

- Localy disable the services test that SEGVs on sle11

Browse Source 
* libreoffice-disable-services-check.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=378
This commit is contained in:
Tomáš Chvátal 2016-03-02 20:37:54 +00:00 committed by Git OBS Bridge
parent ab29fabd40
commit ba273a8ea3
3 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libreoffice-disable-services-check.patch Normal file
View File

@ -0,0 +1,69 @@
Index: libreoffice-5.1.0.3/postprocess/CppunitTest_services.mk
===================================================================
--- libreoffice-5.1.0.3.orig/postprocess/CppunitTest_services.mk
+++ libreoffice-5.1.0.3/postprocess/CppunitTest_services.mk
@@ -7,51 +7,4 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_CppunitTest_CppunitTest,services))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,services, \
- postprocess/qa/services \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,services, \
- boost_headers \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,services, \
- cppu \
- cppuhelper \
- sal \
- test \
- vcl \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,services))
-$(eval $(call gb_CppunitTest_use_api,services,oovbaapi))
-
-$(eval $(call gb_CppunitTest_use_ure,services))
-$(eval $(call gb_CppunitTest_use_vcl,services))
-
-$(eval $(call gb_CppunitTest_use_rdb,services,services))
-ifneq ($(DISABLE_PYTHON),TRUE)
-$(eval $(call gb_CppunitTest_use_python_ure,services))
-
-$(eval $(call gb_CppunitTest_use_rdb,services,pyuno))
-endif
-
-$(eval $(call gb_CppunitTest_use_configuration,services))
-
-ifeq ($(ENABLE_JAVA),TRUE)
-$(eval $(call gb_CppunitTest_use_java_ure,services))
-
-$(eval $(call gb_CppunitTest_use_jars,services,\
- smoketest \
-))
-endif
-
-$(eval $(call gb_CppunitTest_use_packages,services,\
- autotextshare_en-US \
- instsetoo_native_setup \
-))
-
# vim: set noet sw=4 ts=4:
Index: libreoffice-5.1.0.3/postprocess/Module_postprocess.mk
===================================================================
--- libreoffice-5.1.0.3.orig/postprocess/Module_postprocess.mk
+++ libreoffice-5.1.0.3/postprocess/Module_postprocess.mk
@@ -28,8 +28,4 @@ $(eval $(call gb_Module_add_targets,post
))
endif
-$(eval $(call gb_Module_add_check_targets,postprocess,\
- CppunitTest_services \
-))
-
# vim: set noet sw=4 ts=4:

2
libreoffice.changes
View File

@ -4,6 +4,8 @@ Wed Mar 2 16:48:33 UTC 2016 - tchvatal@suse.com
- Add upstreamed patches to fix patch application on sle11: - Add upstreamed patches to fix patch application on sle11:
* 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch * 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
* 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch * 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
- Localy disable the services test that SEGVs on sle11
* libreoffice-disable-services-check.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 2 12:55:31 UTC 2016 - tchvatal@suse.com Wed Mar 2 12:55:31 UTC 2016 - tchvatal@suse.com

5
libreoffice.spec
View File

@ -180,6 +180,8 @@ Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
# PATCH-FIX-UPSTREAM: broken patch command on sle11 fails to apply patch # PATCH-FIX-UPSTREAM: broken patch command on sle11 fails to apply patch
Patch8: 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch Patch8: 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
Patch9: 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch Patch9: 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
# PATCH-FIX-SUSE: disable services unittest that fails
Patch10: libreoffice-disable-services-check.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
@ -1043,6 +1045,9 @@ Provides additional %{langname} translations and resources for %{project}. \
%endif %endif
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%if 0%{?suse_version} < 1130
%patch10 -p1
%endif
%patch990 -p1 %patch990 -p1
# 256x256 icons # 256x256 icons
tar -xjf %{SOURCE20} tar -xjf %{SOURCE20}