From c5df42ed01bf57a97dccc21a1e88d9aa2b1be286 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 15 2020 16:06:43 +0000
Subject: import icedtea-web-1.7.1-18.el8_3


---

diff --git a/SOURCES/altjava.patch b/SOURCES/altjava.patch
new file mode 100644
index 0000000..5a7e54e
--- /dev/null
+++ b/SOURCES/altjava.patch
@@ -0,0 +1,16 @@
+--- icedtea-web-1.7.1/launcher/launchers.in
++++ icedtea-web-1.7.1/launcher/launchers.in
+@@ -70,6 +70,12 @@
+   shift
+ done
+ 
++java_dir="`dirname ${JAVA}`"
++alt_java="alt-java"
++if [ -e "$java_dir/$alt_java" ] ; then
++  JAVA="`dirname ${JAVA}`/$alt_java"
++fi
++
+ k=0
+ COMMAND[k]="${JAVA}"
+ k=$((k+1))
+
diff --git a/SPECS/icedtea-web.spec b/SPECS/icedtea-web.spec
index 1626693..9789e89 100644
--- a/SPECS/icedtea-web.spec
+++ b/SPECS/icedtea-web.spec
@@ -17,7 +17,7 @@
 
 Name:		icedtea-web
 Version:	1.7.1
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	Additional Java components for OpenJDK - Java browser plug-in and Web Start implementation
 # will become arched again with rust on board
 BuildArch:  noarch
@@ -36,6 +36,7 @@ Patch4:     PreventiveleQueue.patch
 Patch11:    issue1-bin.patch
 Patch33:    issue3-bin.patch
 Patch5:     testTuning.patch
+Patch6:     altjava.patch
 
 BuildRequires:  javapackages-tools
 #for deprecated add_maven_depmap, see https://www.spinics.net/lists/fedora-devel/msg233211.html
@@ -122,6 +123,7 @@ This package contains ziped sources of the IcedTea-Web project.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 if [ -e ../.git ] ; then
   mv ../.git ../ggit
 fi
@@ -247,6 +249,11 @@ exit 0
 %license COPYING
 
 %changelog
+* Fri Nov 20 2020 Jiri Vanek <jvanek@redhat.com> 1.7.1-18
+- patched to use alt-java if available
+- Added Patch6, altjava.patch
+- Resolves: rhbz#1888633
+
 * Thu Jul 18 2019 Jiri Vanek <jvanek@redhat.com> 1.7.1-16
 - Added Patch5, testTuning.patch to make tests pass inclean envirnment
 - Resolves: rhbz#1724958