[jpackage-utils] Add support for OpenJDK 8

[Mikolaj Izdebski]

commit 656402afce271e2ef2d07d2838154d6148195a78
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Jul 11 14:52:28 2013 +0200

    Add support for OpenJDK 8
    
    - Resolves: rhbz#982683

 jpackage-utils-openjdk-8.patch |   28 ++++++++++++++++++++++++++++
 jpackage-utils.spec            |   13 ++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/jpackage-utils-openjdk-8.patch b/jpackage-utils-openjdk-8.patch
new file mode 100644
index 0000000..7a3ca35
--- /dev/null
+++ b/jpackage-utils-openjdk-8.patch
@@ -0,0 +1,28 @@
+From 494fea0d6c628fb0e56a8f20c7f629c4dceb2e55 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Thu, 11 Jul 2013 14:47:05 +0200
+Subject: [PATCH] Add support for OpenJDK 8
+
+Patch provided by Florian Weimer in rhbz#982683
+---
+ java-utils/java-functions | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/java-utils/java-functions b/java-utils/java-functions
+index 41b470c..5bda299 100644
+--- a/java-utils/java-functions
++++ b/java-utils/java-functions
+@@ -169,8 +169,8 @@ set_jvm_dirs() {
+         # 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 '/\(openjdk\|java\) \(full \)*version "/s/'$re'/<<<\1>>>/' \
++            -e '/\(openjdk\|java\) \(full \)*version "/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
+         if [ -n "$JAVA_VERSION" ] ; then
+             break
+         fi
+-- 
+1.8.1.4
+
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 5f1af7d..db5ac53 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -36,7 +36,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        26%{?dist}
+Release:        27%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -51,6 +51,8 @@ Patch2:         %{name}-prefer-jre.patch
 Patch3:         %{name}-set-classpath.patch
 Patch5:         %{name}-build-classpath-symlink-fix.patch
 Patch6:         %{name}-update-maven-depmap.patch
+# Backported from javapackages commit 494fea0
+Patch7:         %{name}-openjdk-8.patch
 Group:          Utilities
 
 Requires:       coreutils
@@ -76,6 +78,7 @@ information.
 %patch3 -p1
 %patch5 -p1
 %patch6
+%patch7 -p1
 
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 
@@ -115,10 +118,10 @@ install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-utils
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-ext
-install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.5.0,1.6.0,1.7.0}
+install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.5.0,1.6.0,1.7.0,1.8.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-ext
-install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0}
+install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0,1.8.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_mavenpomdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapdir}
@@ -213,6 +216,10 @@ EOF
 
 
 %changelog
+* Thu Jul 11 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.7.5-27
+- Add support for OpenJDK 8
+- Resolves: rhbz#982683
+
 * Mon Apr 08 2013 Severin Gehwolf <sgehwolf at redhat.com> - 0:1.7.5-26
 - Revert implementation of abs2rel.sh in Perl going back to Lua.
 - Resolves RHBZ#823669