Accepting request 533638 from LibreOffice:Factory

- Make sure now plasma5 gets gtk3 UI not the generic one

- Disable kde4 integration on Tumbleweed as libqt4 is build with
  openssl-1.0 while we need openssl-1.1

- Removed patch:
  * 0001-tdf-100501-Adapt-to-Java-9-at-least-on-Linux-x86-64.patch
    + Integrated upstream

- The commons-codec, commons-lang and commons-httpclient are not
  actually needed

- Version update to 5.4.2.1:
  * Various bugfixes on 5.4 branch

OBS-URL: https://build.opensuse.org/request/show/533638
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=139

0001-tdf-100501-Adapt-to-Java-9-at-least-on-Linux-x86-64.patch

@@ -1,80 +0,0 @@
-From c83aec1d026b9567e7e6d982e4d19f3a566b66d2 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Mon, 28 Aug 2017 15:35:43 +0200
-Subject: [PATCH] tdf#100501: Adapt to Java 9 (at least on Linux x86-64)
-
-Checking with both jdk-9+181_linux-x64_bin.tar.gz and
-jre-9+181_linux-x64_bin.tar.gz as currently available at
-<http://jdk.java.net/9/> "JDK 9 Early-Access Builds":
-
-For one, make SunVersion::init understand <http://openjdk.java.net/jeps/223>
-"JEP 223: New Version-String Scheme" at least insofar as to accept strings like
-"9" with less than three dot-separated segments (where the missing segments are
-treated like "0").
-
-For another, at least for Linux x86-64, libjvm.so is now apparently located in a
-path without an "amd64" architecture segment, "lib/server/libjvm.so".  (But
-could that also be "client"?)  Other platforms may need further adjustments.
-
-Change-Id: Idcebc833472c81a1dc74dcdd481b0a37274a8713
-(cherry picked from commit 52ffad9bb7be800790de6d918154dbeade88cadd, plus
-cda4cea7cdfc9a8de814b901b3b957f029d36aaf "tdf#100501: Fix thinko")
-Reviewed-on: https://gerrit.libreoffice.org/41678
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Michael Stahl <mstahl@redhat.com>
----
- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx     | 3 ++-
- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 7 ++++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
-index 7f7c4943c8be..7543f497eb83 100644
---- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
-+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
-@@ -68,7 +68,10 @@ char const* const* SunInfo::getRuntimePaths(int * size)
-         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-         "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
-         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so",
--        "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so"
-+        "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so",
-+        "/lib/server/libjvm.so",
-+        "/lib/client/libjvm.so",
-+        "/lib/zero/libjvm.so"
- #endif
-     };
-     *size = SAL_N_ELEMENTS(ar);
-diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-index 85f31a383fc6..fb4227da1964 100644
---- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-@@ -88,7 +88,7 @@ bool SunVersion::init(const char *szVersion)
-             ! (nPartPos == 0) // prevents: ".4.1", "..1", part must start with digit
-             && (
-                 //separators after maintenance (1.4.1_01, 1.4.1-beta, or 1.4.1)
--                ((pCur == pEnd || *pCur == '_' || *pCur == '-') && (nPart == 2 ))
-+                (pCur == pEnd || *pCur == '_' || *pCur == '-')
-                 ||
-                 //separators between major-minor and minor-maintenance
-                 (nPart < 2 && *pCur == '.') )
-@@ -97,6 +97,8 @@ bool SunVersion::init(const char *szVersion)
-                 pCur + 1 != pEnd
-                 || rtl::isAsciiDigit(static_cast<unsigned char>(*pCur))) )
-         {
-+            bool afterMaint = pCur == pEnd || *pCur == '_' || *pCur == '-';
-+
-             int len = pCur - pLast;
-             if (len >= 127)
-                 return false;
-@@ -107,6 +109,9 @@ bool SunVersion::init(const char *szVersion)
-             pLast = pCur;
- 
-             m_arVersionParts[nPart] = atoi(buf);
-+
-+            if (afterMaint)
-+                nPart = 2;
-             nPart ++;
-             nPartPos = 0;
-             if (nPart == 3)
--- 
-2.14.1
-

libreoffice-5.4.1.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d320b01900a77cd7427e1b82fb2739fd1eb1fd3a08a75928929638b6470a2730
-size 192435072

libreoffice-5.4.2.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675
+size 192795940

libreoffice-help-5.4.1.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ced4b795b92d42d2acc06be6393faad82a7e6cfbf738819dd4d460a44e61efaa
-size 2343312

libreoffice-help-5.4.2.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fc740dbe77876b96ed731f0a6ce793925a9a4a4ba983b5a3506ab24beb73057
+size 2343504

libreoffice-translations-5.4.1.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f91589ccc03c09f6e7b8079ccea775194c7c9f559ff68b8eef642f9647121c7
-size 136258296

libreoffice-translations-5.4.2.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0eb02a65ffd164d8a9c287ef8b3e0d4db9b45979f72f496a6693ed5c39158d2
+size 136340916

libreoffice.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Oct 12 10:52:03 UTC 2017 - tchvatal@suse.com
+
+- Make sure now plasma5 gets gtk3 UI not the generic one
+
+-------------------------------------------------------------------
+Wed Oct 11 12:20:25 UTC 2017 - tchvatal@suse.com
+
+- Disable kde4 integration on Tumbleweed as libqt4 is build with
+  openssl-1.0 while we need openssl-1.1
+
+-------------------------------------------------------------------
+Tue Oct 10 05:54:01 UTC 2017 - fstrba@suse.com
+
+- Removed patch:
+  * 0001-tdf-100501-Adapt-to-Java-9-at-least-on-Linux-x86-64.patch
+    + Integrated upstream
+
+-------------------------------------------------------------------
+Mon Oct  9 15:02:46 UTC 2017 - fstrba@suse.com
+
+- The commons-codec, commons-lang and commons-httpclient are not
+  actually needed
+
+-------------------------------------------------------------------
+Mon Oct  9 10:49:18 UTC 2017 - tchvatal@suse.com
+
+- Version update to 5.4.2.1:
+  * Various bugfixes on 5.4 branch
+
 -------------------------------------------------------------------
 Mon Oct  2 09:12:37 UTC 2017 - carmen@carmenbianca.eu
 

libreoffice.spec

@@ -22,10 +22,10 @@
 %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.4.1
+%define tarball_url  http://download.documentfoundation.org/libreoffice/src/5.4.2
 #%define tarball_url  http://dev-builds.libreoffice.org/pre-releases/src/
 # Wether to enable the kde integration
-%if 0%{?is_opensuse}
+%if 0%{?is_opensuse} && 0%{?suse_version} < 1330
 %bcond_without kdeintegration
 %else
 %bcond_with kdeintegration
@@ -36,7 +36,7 @@
 %bcond_with firebird
 %endif
 Name:           libreoffice
-Version:        5.4.1.2
+Version:        5.4.2.2
 Release:        0
 Summary:        A Free Office Suite (Framework)
 License:        LGPL-3.0+ AND MPL-2.0+
@@ -88,8 +88,6 @@ Patch100:       0001-This-hunk-breaks-jdk9-build.patch
 Patch101:       0002-Detect-libjawt-automatically-on-java9-too.patch
 # PATCH-FIX-UPSTREAM: addapt getcompver.awk to java 9
 Patch102:       0001-Adapt-getcompver.awk-to-Java-9.patch
-# PATCH-FIX-UPSTREAM: Make LibreOffice find Java 9 JVM at runtime
-Patch103:       0001-tdf-100501-Adapt-to-Java-9-at-least-on-Linux-x86-64.patch
 Patch104:       java-encoding.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
@@ -99,9 +97,6 @@ BuildRequires:  autoconf
 BuildRequires:  awk
 BuildRequires:  bison
 BuildRequires:  bsh2
-BuildRequires:  commons-codec
-BuildRequires:  commons-httpclient
-BuildRequires:  commons-lang
 BuildRequires:  commons-logging
 BuildRequires:  cups-devel
 BuildRequires:  curl-devel
@@ -551,6 +546,9 @@ Requires:       %{name}-gnome = %{version}
 %if 0%{?suse_version} > 1315 || 0%{?is_opensuse}
 Supplements:    packageand(libreoffice:gnome-session)
 %endif
+%if !%{with kdeintegration}
+Supplements:    packageand(libreoffice:plasma5-workspace)
+%endif
 
 %description gtk3
 This package contains Gtk3 interface rendering option for LibreOffice.
@@ -922,7 +920,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
 %patch104 -p1
 %patch990 -p1