diff --git a/0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch b/0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch new file mode 100644 index 0000000..b4d94b9 --- /dev/null +++ b/0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch @@ -0,0 +1,33 @@ +From 9249f975cb90ef6a18cf8aa53345690e206d10ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Wed, 2 Mar 2016 18:21:04 +0100 +Subject: [PATCH] Update etonyek patch to apply with sle11 patch + +Change-Id: I86b43ba29a6b7d0d4c36491234c3354c3d6edf0c +--- + external/libetonyek/libetonyek-bundled-soname.patch.0 | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/external/libetonyek/libetonyek-bundled-soname.patch.0 b/external/libetonyek/libetonyek-bundled-soname.patch.0 +index 753e384..122763d 100644 +--- a/external/libetonyek/libetonyek-bundled-soname.patch.0 ++++ b/external/libetonyek/libetonyek-bundled-soname.patch.0 +@@ -1,9 +1,11 @@ +---- src/lib/Makefile.in.orig 2015-08-07 10:51:32.494810336 +0200 +-+++ src/lib/Makefile.in 2015-08-07 10:51:55.493809942 +0200 +-@@ -463,5 +463,5 @@ ++--- src/lib/Makefile.in.orig 2016-01-12 19:21:24.000000000 +0100 +++++ src/lib/Makefile.in 2016-03-02 18:19:52.214551270 +0100 ++@@ -538,7 +538,7 @@ ++ ++ libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@ + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@ + -libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined + +libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \ + EtonyekDocument.cpp +- ++ +-- +2.7.2 + diff --git a/libreoffice.changes b/libreoffice.changes index c7d0677..6799a6d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- Wed Mar 2 16:48:33 UTC 2016 - tchvatal@suse.com -- Add upstreamed patch 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-Update-etonyek-patch-to-apply-with-sle11-patch.patch ------------------------------------------------------------------- Wed Mar 2 12:55:31 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index c968f87..b5a5162 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -179,6 +179,7 @@ Patch5: mediawiki-no-broken-help.diff 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 +Patch9: 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -1041,6 +1042,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch7 -p1 %endif %patch8 -p1 +%patch9 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}