From e9fdc2e59354e6fc656d04022bf22af01edd71157f1b9d397fadcdd7e7c17d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 4 Apr 2016 11:21:15 +0000
Subject: [PATCH] - Version update to 5.1.2.2:   * Various small bugfixes all
 around 5.1 series - Remove upstreamed patches:   *
 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch   *
 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch   *
 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch - Refresh patches: 
  * 0001-liborcus-0.11.patch   *
 libreoffice-hotfix-disablebrokenshapetest.patch - Fix sle11 build by not
 using -r on ln command

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=396
---
 ...ly-on-SLE11-just-some-unknown-patch-.patch |  29 -----
 ...ild-of-pyuno-with-older-py2-versions.patch |  33 ------
 ...nyek-patch-to-apply-with-sle11-patch.patch |  33 ------
 0001-liborcus-0.11.patch                      | 108 +++++++++---------
 libreoffice-5.1.1.3.tar.xz                    |   3 -
 libreoffice-5.1.2.2.tar.xz                    |   3 +
 libreoffice-help-5.1.1.3.tar.xz               |   3 -
 libreoffice-help-5.1.2.2.tar.xz               |   3 +
 ...office-hotfix-disablebrokenshapetest.patch |  12 +-
 libreoffice-translations-5.1.1.3.tar.xz       |   3 -
 libreoffice-translations-5.1.2.2.tar.xz       |   3 +
 libreoffice.changes                           |  14 +++
 libreoffice.spec                              |  12 +-
 13 files changed, 88 insertions(+), 171 deletions(-)
 delete mode 100644 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
 delete mode 100644 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
 delete mode 100644 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
 delete mode 100644 libreoffice-5.1.1.3.tar.xz
 create mode 100644 libreoffice-5.1.2.2.tar.xz
 delete mode 100644 libreoffice-help-5.1.1.3.tar.xz
 create mode 100644 libreoffice-help-5.1.2.2.tar.xz
 delete mode 100644 libreoffice-translations-5.1.1.3.tar.xz
 create mode 100644 libreoffice-translations-5.1.2.2.tar.xz

diff --git a/0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch b/0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
deleted file mode 100644
index 927264c..0000000
--- a/0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-
diff --git a/0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch b/0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
deleted file mode 100644
index 0fe6f8d..0000000
--- a/0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3cf65156695b965e38f0fd4cacfc9f07e1cd6e17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
-Date: Thu, 3 Mar 2016 13:55:34 +0100
-Subject: [PATCH] Fix python2 build of pyuno with older py2 versions
-
-SyntaxError: ('invalid syntax', ('//usr/lib64/libreoffice/program//uno.py',
-368, 77, "            return _ConstantGroup({c.Name.split('.')[-1]:
-c.ConstantValue for c in td.Constants})\n"))
-
-Change-Id: Ie87c21fbfd83fc4d6f918eb55128db235c2220a8
----
- pyuno/source/module/uno.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index 4c78595..ad77ad3 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -361,7 +361,10 @@ def _impl_getConstantGroupByName( module, group ):
-     qualifiedName = module + '.' + group
-     for td in tde:
-         if td.Name == qualifiedName:
--            return _ConstantGroup({c.Name.split('.')[-1]: c.ConstantValue for c in td.Constants})
-+            return_dict = dict()
-+            for c in td.Constants:
-+                return_dict.update({c.Name.split('.')[-1]: c.ConstantValue})
-+            return _ConstantGroup(return_dict)
-     else:
-         raise ValueError
- 
--- 
-2.7.2
-
diff --git a/0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch b/0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
deleted file mode 100644
index b4d94b9..0000000
--- a/0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9249f975cb90ef6a18cf8aa53345690e206d10ba 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 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/0001-liborcus-0.11.patch b/0001-liborcus-0.11.patch
index c33adb8..e12a9e2 100644
--- a/0001-liborcus-0.11.patch
+++ b/0001-liborcus-0.11.patch
@@ -10,10 +10,10 @@ Reviewed-on: https://gerrit.libreoffice.org/22943
 Tested-by: Jenkins <ci@libreoffice.org>
 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
 
-Index: libreoffice-5.1.1.3/RepositoryExternal.mk
+Index: libreoffice-5.1.2.2/RepositoryExternal.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/RepositoryExternal.mk
-+++ libreoffice-5.1.1.3/RepositoryExternal.mk
+--- libreoffice-5.1.2.2.orig/RepositoryExternal.mk
++++ libreoffice-5.1.2.2/RepositoryExternal.mk
 @@ -786,6 +786,21 @@ $(call gb_LinkTarget_set_include,$(1),\
  
  endef
@@ -54,11 +54,11 @@ Index: libreoffice-5.1.1.3/RepositoryExternal.mk
  )
  
  endef
-Index: libreoffice-5.1.1.3/configure.ac
+Index: libreoffice-5.1.2.2/configure.ac
 ===================================================================
---- libreoffice-5.1.1.3.orig/configure.ac
-+++ libreoffice-5.1.1.3/configure.ac
-@@ -9141,7 +9141,7 @@ if test -z "$enable_orcus" -o "$enable_o
+--- libreoffice-5.1.2.2.orig/configure.ac
++++ libreoffice-5.1.2.2/configure.ac
+@@ -9143,7 +9143,7 @@ if test -z "$enable_orcus" -o "$enable_o
      ENABLE_ORCUS="TRUE"
      AC_DEFINE(ENABLE_ORCUS)
  
@@ -67,14 +67,14 @@ Index: libreoffice-5.1.1.3/configure.ac
      if test "$with_system_orcus" != "yes"; then
          if test "$SYSTEM_BOOST" = "TRUE"; then
              # ===========================================================
-Index: libreoffice-5.1.1.3/download.lst
+Index: libreoffice-5.1.2.2/download.lst
 ===================================================================
---- libreoffice-5.1.1.3.orig/download.lst
-+++ libreoffice-5.1.1.3/download.lst
+--- libreoffice-5.1.2.2.orig/download.lst
++++ libreoffice-5.1.2.2/download.lst
 @@ -112,8 +112,8 @@ export OPENCOLLADA_TARBALL := OpenCOLLAD
  export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
- export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef
- export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz
+ export OPENSSL_MD5SUM := f3c710c045cdee5fd114feb69feba7aa
+ export OPENSSL_TARBALL := openssl-1.0.2g.tar.gz
 -export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0
 -export ORCUS_TARBALL := liborcus-0.9.2.tar.gz
 +export ORCUS_MD5SUM := ca1e5d486b29cd519bb1d9845a6a768e
@@ -82,10 +82,10 @@ Index: libreoffice-5.1.1.3/download.lst
  export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
  export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz
  export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
-Index: libreoffice-5.1.1.3/external/boost/Module_boost.mk
+Index: libreoffice-5.1.2.2/external/boost/Module_boost.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/boost/Module_boost.mk
-+++ libreoffice-5.1.1.3/external/boost/Module_boost.mk
+--- libreoffice-5.1.2.2.orig/external/boost/Module_boost.mk
++++ libreoffice-5.1.2.2/external/boost/Module_boost.mk
 @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,boost))
  
  $(eval $(call gb_Module_add_targets,boost,\
@@ -94,10 +94,10 @@ Index: libreoffice-5.1.1.3/external/boost/Module_boost.mk
  	StaticLibrary_boost_system \
  	StaticLibrary_boost_iostreams \
  	UnpackedTarball_boost \
-Index: libreoffice-5.1.1.3/external/boost/StaticLibrary_boost_filesystem.mk
+Index: libreoffice-5.1.2.2/external/boost/StaticLibrary_boost_filesystem.mk
 ===================================================================
 --- /dev/null
-+++ libreoffice-5.1.1.3/external/boost/StaticLibrary_boost_filesystem.mk
++++ libreoffice-5.1.2.2/external/boost/StaticLibrary_boost_filesystem.mk
 @@ -0,0 +1,36 @@
 +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 +#
@@ -135,10 +135,10 @@ Index: libreoffice-5.1.1.3/external/boost/StaticLibrary_boost_filesystem.mk
 +))
 +
 +# vim: set noet sw=4 ts=4:
-Index: libreoffice-5.1.1.3/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
+Index: libreoffice-5.1.2.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
 ===================================================================
 --- /dev/null
-+++ libreoffice-5.1.1.3/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
++++ libreoffice-5.1.2.2/external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch
 @@ -0,0 +1,1175 @@
 +From a1df2d984d527931c6cbbe6547856283bdbf6a9b Mon Sep 17 00:00:00 2001
 +From: Kohei Yoshida <kohei.yoshida@gmail.com>
@@ -1315,10 +1315,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/0001-Fix-for-OSX-build-inside-Libre
 +-- 
 +2.4.5
 +
-Index: libreoffice-5.1.1.3/external/liborcus/0001-Get-it-to-build-on-Windows.patch
+Index: libreoffice-5.1.2.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch
 ===================================================================
 --- /dev/null
-+++ libreoffice-5.1.1.3/external/liborcus/0001-Get-it-to-build-on-Windows.patch
++++ libreoffice-5.1.2.2/external/liborcus/0001-Get-it-to-build-on-Windows.patch
 @@ -0,0 +1,212 @@
 +From c5d7282214727bcc28b6ec7e2b8016b40872cd3b Mon Sep 17 00:00:00 2001
 +From: Kohei Yoshida <kohei.yoshida@gmail.com>
@@ -1532,10 +1532,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/0001-Get-it-to-build-on-Windows.pat
 +-- 
 +1.8.1.msysgit.1
 +
-Index: libreoffice-5.1.1.3/external/liborcus/ExternalPackage_liborcus.mk
+Index: libreoffice-5.1.2.2/external/liborcus/ExternalPackage_liborcus.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/liborcus/ExternalPackage_liborcus.mk
-+++ libreoffice-5.1.1.3/external/liborcus/ExternalPackage_liborcus.mk
+--- libreoffice-5.1.2.2.orig/external/liborcus/ExternalPackage_liborcus.mk
++++ libreoffice-5.1.2.2/external/liborcus/ExternalPackage_liborcus.mk
 @@ -12,11 +12,11 @@ $(eval $(call gb_ExternalPackage_Externa
  $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
  
@@ -1552,10 +1552,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/ExternalPackage_liborcus.mk
  endif
  
  # vim: set noet sw=4 ts=4:
-Index: libreoffice-5.1.1.3/external/liborcus/ExternalProject_liborcus.mk
+Index: libreoffice-5.1.2.2/external/liborcus/ExternalProject_liborcus.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/liborcus/ExternalProject_liborcus.mk
-+++ libreoffice-5.1.1.3/external/liborcus/ExternalProject_liborcus.mk
+--- libreoffice-5.1.2.2.orig/external/liborcus/ExternalProject_liborcus.mk
++++ libreoffice-5.1.2.2/external/liborcus/ExternalProject_liborcus.mk
 @@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_aut
  
  $(eval $(call gb_ExternalProject_use_externals,liborcus, \
@@ -1607,10 +1607,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/ExternalProject_liborcus.mk
  		) \
  	)
  
-Index: libreoffice-5.1.1.3/external/liborcus/Library_orcus-parser.mk
+Index: libreoffice-5.1.2.2/external/liborcus/Library_orcus-parser.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/liborcus/Library_orcus-parser.mk
-+++ libreoffice-5.1.1.3/external/liborcus/Library_orcus-parser.mk
+--- libreoffice-5.1.2.2.orig/external/liborcus/Library_orcus-parser.mk
++++ libreoffice-5.1.2.2/external/liborcus/Library_orcus-parser.mk
 @@ -39,6 +39,8 @@ $(eval $(call gb_Library_add_generated_e
  	UnpackedTarball/liborcus/src/parser/css_types \
  	UnpackedTarball/liborcus/src/parser/csv_parser_base \
@@ -1628,10 +1628,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/Library_orcus-parser.mk
  	UnpackedTarball/liborcus/src/parser/zip_archive \
  	UnpackedTarball/liborcus/src/parser/zip_archive_stream \
  ))
-Index: libreoffice-5.1.1.3/external/liborcus/Library_orcus.mk
+Index: libreoffice-5.1.2.2/external/liborcus/Library_orcus.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/liborcus/Library_orcus.mk
-+++ libreoffice-5.1.1.3/external/liborcus/Library_orcus.mk
+--- libreoffice-5.1.2.2.orig/external/liborcus/Library_orcus.mk
++++ libreoffice-5.1.2.2/external/liborcus/Library_orcus.mk
 @@ -13,6 +13,7 @@ $(eval $(call gb_Library_use_unpacked,or
  
  $(eval $(call gb_Library_use_externals,orcus,\
@@ -1694,10 +1694,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/Library_orcus.mk
  ))
  
  # vim: set noet sw=4 ts=4:
-Index: libreoffice-5.1.1.3/external/liborcus/UnpackedTarball_liborcus.mk
+Index: libreoffice-5.1.2.2/external/liborcus/UnpackedTarball_liborcus.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/liborcus/UnpackedTarball_liborcus.mk
-+++ libreoffice-5.1.1.3/external/liborcus/UnpackedTarball_liborcus.mk
+--- libreoffice-5.1.2.2.orig/external/liborcus/UnpackedTarball_liborcus.mk
++++ libreoffice-5.1.2.2/external/liborcus/UnpackedTarball_liborcus.mk
 @@ -16,8 +16,15 @@ $(eval $(call gb_UnpackedTarball_set_pat
  $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
  	external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
@@ -1716,9 +1716,9 @@ Index: libreoffice-5.1.1.3/external/liborcus/UnpackedTarball_liborcus.mk
 +
 +
  # vim: set noet sw=4 ts=4:
-Index: libreoffice-5.1.1.3/external/liborcus/fix-crash-ooo55043-1.patch.0
+Index: libreoffice-5.1.2.2/external/liborcus/fix-crash-ooo55043-1.patch.0
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/liborcus/fix-crash-ooo55043-1.patch.0
+--- libreoffice-5.1.2.2.orig/external/liborcus/fix-crash-ooo55043-1.patch.0
 +++ /dev/null
 @@ -1,17 +0,0 @@
 ---- src/parser/zip_archive_stream.cpp
@@ -1738,9 +1738,9 @@ Index: libreoffice-5.1.1.3/external/liborcus/fix-crash-ooo55043-1.patch.0
 -     if (length_available < length)
 -         throw zip_error("There is not enough stream left to fill requested length.");
 - 
-Index: libreoffice-5.1.1.3/external/liborcus/unusedheader.patch.0
+Index: libreoffice-5.1.2.2/external/liborcus/unusedheader.patch.0
 ===================================================================
---- libreoffice-5.1.1.3.orig/external/liborcus/unusedheader.patch.0
+--- libreoffice-5.1.2.2.orig/external/liborcus/unusedheader.patch.0
 +++ /dev/null
 @@ -1,11 +0,0 @@
 ---- ./src/parser/pstring.cpp.orig	2015-12-02 14:38:44.658744408 +0000
@@ -1754,10 +1754,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/unusedheader.patch.0
 - using namespace std;
 - 
 - namespace orcus {
-Index: libreoffice-5.1.1.3/external/liborcus/windows-constants-hack.patch
+Index: libreoffice-5.1.2.2/external/liborcus/windows-constants-hack.patch
 ===================================================================
 --- /dev/null
-+++ libreoffice-5.1.1.3/external/liborcus/windows-constants-hack.patch
++++ libreoffice-5.1.2.2/external/liborcus/windows-constants-hack.patch
 @@ -0,0 +1,15 @@
 +diff --git a/src/liborcus/info.cpp b/src/liborcus/info.cpp
 +index ae571f5..539ce18 100644
@@ -1774,10 +1774,10 @@ Index: libreoffice-5.1.1.3/external/liborcus/windows-constants-hack.patch
 + 
 + namespace orcus {
 + 
-Index: libreoffice-5.1.1.3/sc/Library_scfilt.mk
+Index: libreoffice-5.1.2.2/sc/Library_scfilt.mk
 ===================================================================
---- libreoffice-5.1.1.3.orig/sc/Library_scfilt.mk
-+++ libreoffice-5.1.1.3/sc/Library_scfilt.mk
+--- libreoffice-5.1.2.2.orig/sc/Library_scfilt.mk
++++ libreoffice-5.1.2.2/sc/Library_scfilt.mk
 @@ -227,6 +227,7 @@ ifeq ($(ENABLE_ORCUS),TRUE)
  $(eval $(call gb_Library_use_externals,scfilt,\
  	orcus \
@@ -1786,10 +1786,10 @@ Index: libreoffice-5.1.1.3/sc/Library_scfilt.mk
  	boost_system \
  	boost_iostreams \
  	zlib \
-Index: libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx
+Index: libreoffice-5.1.2.2/sc/source/filter/inc/orcusinterface.hxx
 ===================================================================
---- libreoffice-5.1.1.3.orig/sc/source/filter/inc/orcusinterface.hxx
-+++ libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx
+--- libreoffice-5.1.2.2.orig/sc/source/filter/inc/orcusinterface.hxx
++++ libreoffice-5.1.2.2/sc/source/filter/inc/orcusinterface.hxx
 @@ -381,6 +381,7 @@ public:
  
      virtual void set_border_count(size_t n) override;
@@ -1806,10 +1806,10 @@ Index: libreoffice-5.1.1.3/sc/source/filter/inc/orcusinterface.hxx
      virtual size_t commit_cell_style() override;
  };
  
-Index: libreoffice-5.1.1.3/sc/source/filter/orcus/filterdetect.cxx
+Index: libreoffice-5.1.2.2/sc/source/filter/orcus/filterdetect.cxx
 ===================================================================
---- libreoffice-5.1.1.3.orig/sc/source/filter/orcus/filterdetect.cxx
-+++ libreoffice-5.1.1.3/sc/source/filter/orcus/filterdetect.cxx
+--- libreoffice-5.1.2.2.orig/sc/source/filter/orcus/filterdetect.cxx
++++ libreoffice-5.1.2.2/sc/source/filter/orcus/filterdetect.cxx
 @@ -93,7 +93,7 @@ OUString OrcusFormatDetect::detect(css::
      }
  
@@ -1819,10 +1819,10 @@ Index: libreoffice-5.1.1.3/sc/source/filter/orcus/filterdetect.cxx
          return OUString("Gnumeric XML");
  
      return OUString();
-Index: libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx
+Index: libreoffice-5.1.2.2/sc/source/filter/orcus/interface.cxx
 ===================================================================
---- libreoffice-5.1.1.3.orig/sc/source/filter/orcus/interface.cxx
-+++ libreoffice-5.1.1.3/sc/source/filter/orcus/interface.cxx
+--- libreoffice-5.1.2.2.orig/sc/source/filter/orcus/interface.cxx
++++ libreoffice-5.1.2.2/sc/source/filter/orcus/interface.cxx
 @@ -55,7 +55,7 @@ void ScOrcusGlobalSettings::set_default_
  
  orcus::spreadsheet::formula_grammar_t ScOrcusGlobalSettings::get_default_formula_grammar() const
diff --git a/libreoffice-5.1.1.3.tar.xz b/libreoffice-5.1.1.3.tar.xz
deleted file mode 100644
index 74e0e8c..0000000
--- a/libreoffice-5.1.1.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38
-size 175820100
diff --git a/libreoffice-5.1.2.2.tar.xz b/libreoffice-5.1.2.2.tar.xz
new file mode 100644
index 0000000..3d5a655
--- /dev/null
+++ b/libreoffice-5.1.2.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781
+size 173763036
diff --git a/libreoffice-help-5.1.1.3.tar.xz b/libreoffice-help-5.1.1.3.tar.xz
deleted file mode 100644
index 3117567..0000000
--- a/libreoffice-help-5.1.1.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9
-size 1904764
diff --git a/libreoffice-help-5.1.2.2.tar.xz b/libreoffice-help-5.1.2.2.tar.xz
new file mode 100644
index 0000000..e689ae5
--- /dev/null
+++ b/libreoffice-help-5.1.2.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc4d9fd6ca78ad89069ca1f0187f274c9cd83fb8849716193d25bce6ca072953
+size 1900736
diff --git a/libreoffice-hotfix-disablebrokenshapetest.patch b/libreoffice-hotfix-disablebrokenshapetest.patch
index c4e7231..8eb39bb 100644
--- a/libreoffice-hotfix-disablebrokenshapetest.patch
+++ b/libreoffice-hotfix-disablebrokenshapetest.patch
@@ -1,8 +1,8 @@
-Index: libreoffice-5.1.1.3/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+Index: libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
 ===================================================================
---- libreoffice-5.1.1.3.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-+++ libreoffice-5.1.1.3/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1103,25 +1103,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "
+--- libreoffice-5.1.2.2.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
++++ libreoffice-5.1.2.2/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+@@ -1103,29 +1103,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "
      assertXPath(pXmlDoc, "//w:ind", "start", "1418");
  }
  
@@ -17,12 +17,16 @@ Index: libreoffice-5.1.1.3/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
 -    // check rotation angle
 -    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
 -    // check the first few coordinates of the polygon
+-#ifndef MACOSX /* Retina-reatled rounding rountrip error
+-                * hard to smooth out due to the use of string compare
+-                * instead of number */
 -    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
 -    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
 -    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
 -    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
 -    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
 -    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
+-#endif
 -}
 -
  #endif
diff --git a/libreoffice-translations-5.1.1.3.tar.xz b/libreoffice-translations-5.1.1.3.tar.xz
deleted file mode 100644
index 2550d4b..0000000
--- a/libreoffice-translations-5.1.1.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:949dedb503ea222ffdcd9bda44b7c1719ab9be3d37e0dd9409341e8f53dbce76
-size 131673020
diff --git a/libreoffice-translations-5.1.2.2.tar.xz b/libreoffice-translations-5.1.2.2.tar.xz
new file mode 100644
index 0000000..d0f8988
--- /dev/null
+++ b/libreoffice-translations-5.1.2.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fbf0d742df7d9a5cf567bb8b8d78e16160936a6f339b9d035e0ac9e1d2455f0
+size 131600616
diff --git a/libreoffice.changes b/libreoffice.changes
index 6462b0f..b391e50 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Apr  4 09:17:16 UTC 2016 - tchvatal@suse.com
+
+- Version update to 5.1.2.2:
+  * Various small bugfixes all around 5.1 series
+- Remove upstreamed patches:
+  * 0001-Fix-patch-to-apply-on-SLE11-just-some-unknown-patch-.patch
+  * 0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
+  * 0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
+- Refresh patches:
+  * 0001-liborcus-0.11.patch
+  * libreoffice-hotfix-disablebrokenshapetest.patch
+- Fix sle11 build by not using -r on ln command
+
 -------------------------------------------------------------------
 Fri Apr  1 10:40:30 UTC 2016 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 1b6e6cd..69487e1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -22,7 +22,7 @@
 %define         numbertext_version 0.9.5
 # Urls
 %define         external_url       http://dev-www.libreoffice.org/src/
-%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.1.1
+%define         tarball_url        http://download.documentfoundation.org/libreoffice/src/5.1.2
 # Old Make and bundle or not
 %if 0%{?suse_version} > 1230
 %bcond_with oldmake
@@ -64,7 +64,7 @@ Requires:       python-importlib
 %endif
 # This is used due to the need for beta releases
 Name:           libreoffice
-Version:        5.1.1.3
+Version:        5.1.2.2
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
@@ -172,9 +172,6 @@ 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
-Patch9:         0001-Update-etonyek-patch-to-apply-with-sle11-patch.patch
-Patch11:        0001-Fix-python2-build-of-pyuno-with-older-py2-versions.patch
 Patch12:        0001-mdds-1.0.patch
 Patch13:        0001-liborcus-0.11.patch
 Patch14:        0002-boost-filesystem1.patch
@@ -1071,9 +1068,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %if !%{with systemlibs}
 %patch7 -p1
 %endif
-%patch8 -p1
-%patch9 -p1
-%patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
@@ -1474,7 +1468,7 @@ echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt
 install -m 0755 -d %{buildroot}%{_datadir}/glade/catalogs
 mv %{buildroot}%{_libdir}/%{name}/share/glade/libreoffice-catalog.xml %{buildroot}%{_datadir}/glade/catalogs
 install -m 0755 -d %{buildroot}%{_datadir}/glade3/catalogs
-ln -sr %{buildroot}%{_datadir}/glade/catalogs/libreoffice-catalog.xml %{buildroot}%{_datadir}/glade3/catalogs
+ln -s %{_datadir}/glade/catalogs/libreoffice-catalog.xml %{buildroot}%{_datadir}/glade3/catalogs
 grep -v '%{_libdir}/%{name}/share/glade/libreoffice-catalog.xml' file-lists/common_list.txt > tmplist
 mv tmplist file-lists/common_list.txt