From 3bad3d6811229e813d13e8e7b434673b19227842df15f2f864b54eb56dbac258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 19 Mar 2016 17:11:37 +0000 Subject: [PATCH] - Remove services patch, no longer needed everything tweaked upstream: * libreoffice-disable-services-check.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=390 --- libreoffice-disable-services-check.patch | 13 ------------- libreoffice.changes | 6 ++++++ libreoffice.spec | 5 ----- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 libreoffice-disable-services-check.patch diff --git a/libreoffice-disable-services-check.patch b/libreoffice-disable-services-check.patch deleted file mode 100644 index d059f21..0000000 --- a/libreoffice-disable-services-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -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: diff --git a/libreoffice.changes b/libreoffice.changes index a0c691e..d530528 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 19 17:10:52 UTC 2016 - tchvatal@suse.com + +- Remove services patch, no longer needed everything tweaked upstream: + * libreoffice-disable-services-check.patch + ------------------------------------------------------------------- Fri Mar 11 20:41:35 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 7a7cafc..9f128ab 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -181,8 +181,6 @@ Patch14: 0002-boost-filesystem1.patch Patch15: 0003-boost-filesystem2.patch # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch -# PATCH-FIX-SUSE: disable services unittest that fails -Patch10: libreoffice-disable-services-check.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -1053,9 +1051,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch14 -p1 %patch15 -p1 %patch16 -p1 -%if 0%{?suse_version} < 1130 -%patch10 -p1 -%endif %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}