[packages/jpackage-utils] Fix java version detection under OpenJDK

[jajcus]

commit 584f2e0cfad9719c2ef55aaa37177eb29b006dd8
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Wed Oct 7 10:33:53 2015 +0200

    Fix java version detection under OpenJDK
    
    Release: 7

 java_version.patch  | 14 ++++++++++++++
 jpackage-utils.spec |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 635984f..56345b8 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -3,7 +3,7 @@ Summary:	JPackage utilities
 Summary(pl.UTF-8):	Narzędzia JPackage
 Name:		jpackage-utils
 Version:	1.7.5
-Release:	6
+Release:	7
 License:	BSD-like
 Group:		Development/Languages/Java
 Source0:	%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch2:		%{name}-errors.patch
 Patch3:		%{name}-noyelling.patch
 Patch4:		%{name}-readlink.patch
 Patch5:		%{name}-jvm_exports_via_link.patch
+Patch6:		java_version.patch
 URL:		http://www.jpackage.org/
 BuildRequires:	rpmbuild(macros) >= 1.555
 Requires:	/bin/egrep
@@ -84,6 +85,7 @@ pliki XSL dla programu maven2, plik nagłówkowy dla plików spec itp.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # we cp -a complete dir from source
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
diff --git a/java_version.patch b/java_version.patch
new file mode 100644
index 0000000..fb99ad7
--- /dev/null
+++ b/java_version.patch
@@ -0,0 +1,14 @@
+diff -dur jpackage-utils-1.7.5.orig/java-utils/java-functions jpackage-utils-1.7.5/java-utils/java-functions
+--- jpackage-utils-1.7.5.orig/java-utils/java-functions	2015-10-07 10:31:46.000000000 +0200
++++ jpackage-utils-1.7.5/java-utils/java-functions	2015-10-07 10:32:36.000000000 +0200
+@@ -145,8 +145,8 @@
+         # Yuck, "grep -o" would be cleaner, but requires GNU grep >= 2.5.
+         # This could be improved/simplified if sed had non-greedy matching.
+         JAVA_VERSION=$($JAVACMD $opt 2>&1 | sed -n \
+-            -e '/java \(full \)*version "/s/'"$re"'/<<<\1>>>/' \
+-            -e '/java \(full \)*version "/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
++            -e '/\(java\|openjdk\) \(full \)*version "/s/'"$re"'/<<<\1>>>/' \
++            -e '/\(java\|openjdk\) \(full \)*version "/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
+         if [ -n "$JAVA_VERSION" ] ; then
+             break
+         fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jpackage-utils.git/commitdiff/584f2e0cfad9719c2ef55aaa37177eb29b006dd8