- Use old java for detection and old commons-lang/codec to pass

brp check on java from sle11 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=266
2015-04-23 15:48:49 +00:00 · 2015-04-23 15:48:49 +00:00 · fcd731e3e8
commit fcd731e3e8
parent eb210709d0
7 changed files with 60 additions and 8 deletions
--- a/0001-Make-HAVE_JAVA6-be-always-false.patch
+++ b/0001-Make-HAVE_JAVA6-be-always-false.patch
@ -0,0 +1,41 @@
+From 901eeaacd7219f61816b28873e45264c7d7de1ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
+Date: Thu, 23 Apr 2015 17:41:10 +0200
+Subject: [PATCH] Make HAVE_JAVA6 be always false
+
+Even if we have newer java for bundling we still test for 1.5 java
+to be able to execute our bitecode.
+
+Change-Id: I7bf5d86c4558b8ed583e3741c10e10daaaa825a7
+NOTE: Do NOT upstream this.
+---
+ configure.ac | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0d492ad..ba02fd6 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -6725,9 +6725,6 @@ if test "$ENABLE_JAVA" != ""; then
+             if test "$_jdk_ver" -lt 10500; then
+                 AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])
+             fi
+-            if test "$_jdk_ver" -ge 10600; then
+-                HAVE_JAVA6=TRUE
+-            fi
+ 
+             AC_MSG_RESULT([checked (IBM JDK $_jdk)])
+ 
+@@ -6750,9 +6747,6 @@ you must use the "--with-jdk-home" configure option explicitly])
+             if test "$_jdk_ver" -gt 10600; then
+                 JAVA_CLASSPATH_NOT_SET="1"
+             fi
+-            if test "$_jdk_ver" -ge 10600; then
+-                HAVE_JAVA6=TRUE
+-            fi
+             if test "$_jdk_ver" -ge 10900; then
+                 HAVE_JAVA9=TRUE
+             fi
+-- 
+2.3.5
+
--- a/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
+++ b/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a751a036a3488e2519bc105dcf80df9c004ab1a982d1dd96bbfbf07802df8831
-size 525299
--- a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
+++ b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b
+size 262206
--- a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
+++ b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4
+size 522654
--- a/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
+++ b/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97ca24c80d416f651dcd3513611d5ea855be21a994e3d48563c837a599618908
-size 739050
--- a/libreoffice.changes
+++ b/libreoffice.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 23 15:48:11 UTC 2015 - tchvatal@suse.com
+
+- Use old java for detection and old commons-lang/codec to pass
+  brp check on java from sle11
+
 -------------------------------------------------------------------
 Thu Apr 23 08:27:20 UTC 2015 - tchvatal@suse.com

--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -135,7 +135,7 @@ Source2039:     %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 Source2040:     %{external_url}/Firebird-2.5.2.26540-0.tar.bz2
 Source2041:     %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
 Source2042:     %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
-Source2043:     %{external_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
+Source2043:     %{external_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
 Source2044:     %{external_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
 Source2045:     %{external_url}/commons-logging-1.2-src.tar.gz
 Source2046:     %{external_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@ -152,7 +152,7 @@ Source2056:     %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 Source2057:     %{external_url}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 Source2058:     %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 Source2059:     %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-Source2060:     %{external_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
+Source2060:     %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
 Source2061:     %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 Source2062:     %{external_url}/language-subtag-registry-2014-12-03.tar.bz2
 # Make for old distros where too old gnumake resides
@ -171,6 +171,8 @@ Patch4:         nlpsolver-no-broken-help.diff
 Patch5:         mediawiki-no-broken-help.diff
 # PATCH-FIX-UPSTREAM: patch to build with older poppler, will be in 5.0
 Patch6:         0001-Make-cpp-poppler-version.h-header-optional.patch
+# PATCH-FIX-SUSE: do not declare java6 available for without system libs build
+Patch7:         0001-Make-HAVE_JAVA6-be-always-false.patch
 # try to save space by using hardlinks
 Patch990:       install-with-hardlinks.diff
 %if %{with systemlibs}
@ -966,6 +968,9 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch4
 %patch5
 %patch6 -p1
+%if !%{with systemlibs}
+%patch7 -p1
+%endif
 %patch990 -p1
 # 256x256 icons
 tar -xjf %{SOURCE20}