pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add upstreamed patch to fix patch application on sle11:

Browse Source 
* 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=376
This commit is contained in:
Tomáš Chvátal 2016-03-02 16:49:22 +00:00 committed by Git OBS Bridge
parent 4e7f31b186
commit 7214e932c7
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch Normal file
View File

@ -0,0 +1,29 @@
From 2e5d78b3e0ebfaed001bf429df04a98f4b050607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 2 Mar 2016 17:20:23 +0100
Subject: [PATCH] Fix patch to apply on SLE11, just some unknown patch binary
hickup
Change-Id: I6cb707663e2abad8761b172773ee70f9caf4a87d
---
external/libodfgen/libodfgen-bundled-soname.patch.0 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 b/external/libodfgen/libodfgen-bundled-soname.patch.0
index 297cd30..052ba79 100644
--- a/external/libodfgen/libodfgen-bundled-soname.patch.0
+++ b/external/libodfgen/libodfgen-bundled-soname.patch.0
@@ -1,6 +1,7 @@
---- src/Makefile.in.orig 2015-08-07 11:26:16.388774624 +0200
-+++ src/Makefile.in 2015-08-07 11:27:01.428773852 +0200
-@@ -372,7 +372,7 @@
+diff -urN src/Makefile.in.orig src/Makefile.in
+--- src/Makefile.in.orig 2016-03-02 17:17:02.812606210 +0100
++++ src/Makefile.in 2016-03-02 17:17:25.176670151 +0100
+@@ -355,7 +355,7 @@
AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBODFGEN_BUILD
libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS)
libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@
--
2.7.2

6
libreoffice.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Mar 2 16:48:33 UTC 2016 - tchvatal@suse.com
- Add upstreamed patch to fix patch application on sle11:
* 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
-------------------------------------------------------------------
Wed Mar 2 12:55:31 UTC 2016 - tchvatal@suse.com

3
libreoffice.spec
View File

@ -177,6 +177,8 @@ Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff
# PATCH-FIX-SUSE: do not declare java6 available for without system libs build
Patch7: 0001-Make-HAVE_JAVA6-be-always-false.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
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -1038,6 +1040,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs}
%patch7 -p1
%endif
%patch8 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}