From 068341625ef0dfab293323abc49210493342b9c2 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 17 Jul 2018 14:52:38 +0200
Subject: [PATCH] Updated to jdk-11+22

---
 .gitignore           |  1 +
 java-11-openjdk.spec | 21 +++++++++++++++++----
 sources              |  2 +-
 update_package.sh    |  5 ++---
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed272ac..ba53645 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 /shenandoah-jdk11-b516c8c7a0a4.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 00c6998..74e83e2 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -196,7 +196,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        20
+%global buildver        22
 # priority must be 7 digits in total
 # setting to 1, so debug ones can have 0
 %global priority        00000%{minorver}1
@@ -698,10 +698,11 @@ exit 0
 %define java_rpo() %{expand:
 Requires: fontconfig%{?_isa}
 Requires: xorg-x11-fonts-Type1
-
 # Requires rest of java
 Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
 OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
+# for java-X-openjdk package's desktop binding
+Recommends: gtk2%{?_isa}
 
 Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
 
@@ -740,6 +741,8 @@ Requires(post):   chkconfig >= 1.7
 Requires(postun): %{_sbindir}/alternatives
 # in version 1.7 and higher for --family switch
 Requires(postun):   chkconfig >= 1.7
+# for optional support of kernel stream control, card reader and printing bindings
+Suggests: lksctp-tools%{?_isa}, pcsc-lite-devel%{?_isa}, cups
 
 # Standard JPackage base provides
 Provides: jre-headless%{?1} = %{epoch}:%{javaver}
@@ -869,7 +872,7 @@ URL:      http://openjdk.java.net/
 
 # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: shenandoah-jdk%{majorver}-b516c8c7a0a4.tar.xz
+Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{majorver}+%{buildver}.tar.xz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -1264,6 +1267,9 @@ else
   debugbuild=`echo $suffix  | sed "s/-//g"`
 fi
 
+# Variable used in hs_err hook on build failures
+top_dir_abs_path=$(pwd)/%{top_level_dir_name}
+
 mkdir -p %{buildoutputdir -- $suffix}
 pushd %{buildoutputdir -- $suffix}
 
@@ -1300,7 +1306,7 @@ make \
     LOG=trace \
     WARNINGS_ARE_ERRORS="-Wno-error" \
     CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
-    %{targets}
+    %{targets} || ( pwd; find $top_dir_abs_path -name "hs_err_pid*.log" | xargs cat && false )
 
 make docs-zip
 
@@ -1728,6 +1734,13 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Tue Jul 17 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.22-1
+- added Recommends gtk2 for main package
+- added Suggests lksctp-tools, pcsc-lite-devel, cups for headless package
+- see RHBZ1598152
+- added trick to catch hs_err files (sgehwolf)
+- updated to shenandaoh-jdk-11+22
+
 * Sat Jul 07 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.20-1
 - removed patch6 JDK-8205616-systemLcmsAndJpgFixFor-rev_f0aeede1b855.patch
 - improved a bit generate_source_tarball.sh to serve also for systemtap
diff --git a/sources b/sources
index 12a32df..210f6a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (shenandoah-jdk11-b516c8c7a0a4.tar.xz) = b39ea358cb1906a1b168fbf0c8df388625a33b047c7a07b96472c9b32368df557d69fc5f8c15d2fab5fee20e092fb502981ab61f23a1f9912d1eecb9eac9406f
 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz) = 26b21be95d7302a4cf4afc63a0edc59ba3829303985654b5b6148a54f0bd6a36685463ccca86ed68f7498bfd8e7bec270e67210747e15b2d44105f4f00e48aa6
diff --git a/update_package.sh b/update_package.sh
index d78c50b..ced9ef2 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -35,9 +35,7 @@ fi
 export PROJECT_NAME="shenandoah"
 export REPO_NAME="jdk11"
 # warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
-# export VERSION="shenandoah-jdk11+22" 
-# will arrive at wednesday
-export VERSION="b516c8c7a0a4"
+export VERSION="shenandoah-jdk-11+22"
 export COMPRESSION=xz
 # unset tapsets overrides
 export OPENJDK_URL=""
@@ -65,6 +63,7 @@ echo "align specfile acordingly:"
 echo " sed 's/^Source0:.*/Source0: $name_helper/' -i *.spec"
 echo " sed 's/^Source8:.*/Source8: $TAPSET/'   -i *.spec"
 echo " sed 's/^%global buildver.*/%global buildver        $build/'   -i *.spec"
+echo " sed 's/Release:.*/Release: 1%{?dist}/'   -i *.spec"
 echo "and maybe others...."
 echo "you should fedpkg/rhpkg new-sources $TAPSET $FILENAME"
 echo "you should fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"