From d60452d8e2c8916e4f8fb627d91e7fca384e3b5d Mon Sep 17 00:00:00 2001
From: Petra Mikova <pmikova@redhat.com>
Date: Wed, 22 Jul 2020 15:54:38 +0200
Subject: [PATCH] July 2020 CPU

Update to 14.0.2+12 sources
Remove upstreamed patches jdk8237879-make_4_3_build_fixes.patch, jdk8235833-posixplatform_cpp_should_not_include_sysctl_h.patch, jdk8243059-build_fails_when_with_vendor_contains_comma.patch
---
 .gitignore                                    |  1 +
 java-latest-openjdk.spec                      | 19 ++++++++-----------
 ...ails_when_with_vendor_contains_comma.patch | 12 ------------
 sources                                       |  2 +-
 4 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 jdk8243059-build_fails_when_with_vendor_contains_comma.patch

diff --git a/.gitignore b/.gitignore
index e01aff7..955535e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz
 /jdk-jdk14-jdk-14+36.tar.xz
 /jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz
+/jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 8aa7347..40f90e1 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -204,7 +204,7 @@
 # Used via new version scheme. JDK 14 was
 # GA'ed in March 2020 => 20.3
 %global vendor_version_string 20.3
-%global securityver 1
+%global securityver 2
 # buildjdkver is usually same as %%{majorver},
 # but in time of bootstrap of next jdk, it is majorver-1, 
 # and this it is better to change it here, on single place
@@ -219,8 +219,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        7
-%global rpmrelease      4
+%global buildver        12
+%global rpmrelease      1
 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -1056,18 +1056,12 @@ Patch4:    pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
 Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
 
 	
-#############################################	
-#
-# OpenJDK specific patches	
-#	
-#############################################
 
 #############################################
 #
-# OpenJDK upstreamable patches
+# OpenJDK patches in need of upstreaming
 #
 #############################################
-Patch8: jdk8243059-build_fails_when_with_vendor_contains_comma.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1294,7 +1288,6 @@ pushd %{top_level_dir_name}
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
-%patch8 -p1
 popd # openjdk
 
 %patch1000
@@ -1840,6 +1833,10 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Wed Jul 22 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.2.12-1.rolling
+- update to jdk 14.0.2.12 CPU version
+- remove upstreamed patch jdk8243059-build_fails_when_with_vendor_contains_comma.patch
+
 * Thu Jul 09 2020 Andrew Hughes <gnu.andrew@redhat.com> - 1:14.0.1.7-4.rolling
 - Re-introduce java-openjdk-src & java-openjdk-demo for system_jdk builds.
 - Fix accidental renaming of java-openjdk-devel to java-devel-openjdk.
diff --git a/jdk8243059-build_fails_when_with_vendor_contains_comma.patch b/jdk8243059-build_fails_when_with_vendor_contains_comma.patch
deleted file mode 100644
index bf3a82b..0000000
--- a/jdk8243059-build_fails_when_with_vendor_contains_comma.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
---- a/make/launcher/LauncherCommon.gmk
-+++ b/make/launcher/LauncherCommon.gmk
-@@ -139,7 +139,7 @@
-       OPTIMIZATION := $$($1_OPTIMIZATION), \
-       CFLAGS := $$(CFLAGS_JDKEXE) \
-           $(LAUNCHER_CFLAGS) \
--          $(VERSION_CFLAGS) \
-+          $(subst $(COMMA),$(DOLLAR)(COMMA),$(VERSION_CFLAGS)) \
-           -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
-           -DPROGNAME='"$1"' \
-           $$($1_CFLAGS), \
diff --git a/sources b/sources
index 440cd4b..b71ccea 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz) = cbd05728395d09b4d69ecfee6eb737262d199e0bbc8ad047c1912cbb23dd2434753f2a7070a9a71aa6cd8e09ff0badd8a25c9e1ec512936ffd234e530baae357
+SHA512 (jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz) = c347bafb3d69fa6ddb43b4d693a2ec9994107446bf67215081dd009fef4e13b3fec3eb2efc88f7dd5eabc2c121b39d88bffa93983660490192e1c2d86bfb6348
 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d