From ed5ef5c69e76ba75086c9a80b30ade062e1660ab Mon Sep 17 00:00:00 2001
From: Petra Mikova <pmikova@redhat.com>
Date: Mon, 20 Apr 2020 13:56:38 +0200
Subject: [PATCH] CPU update to OpenJDK 14.0.1+7

---
 .gitignore               |  1 +
 java-latest-openjdk.spec | 14 +++++++++-----
 sources                  |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f2d4d66..e01aff7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz
 /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
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index f307d04..a4a8f1e 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -200,7 +200,7 @@
 
 # New Version-String scheme-style defines
 %global majorver 14
-%global securityver 0
+%global securityver 1
 # 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
@@ -218,8 +218,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        36
-%global rpmrelease      4
+%global buildver        7
+%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} )
@@ -1014,7 +1014,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: jdk-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz
+Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -1628,7 +1628,7 @@ if ! echo $suffix | grep -q "debug" ; then
   # Install Javadoc documentation
   install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
   cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-  cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+  cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
 fi
 
 # Install icons and menu entries
@@ -1841,6 +1841,10 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Fri Apr 17 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.1.7-1.rolling
+- April security update
+- uploaded new src tarball
+
 * Wed Apr 08 2020 Jiri Vanek <jvanek@redhat.com> - 1:14.0.0.36-4.rolling
 - set vendor property and vendor urls
 - made urls to be preconfigured by os
diff --git a/sources b/sources
index 50c9ea5..440cd4b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-jdk14-jdk-14+36.tar.xz) = 5899890584a43d81643ae32b833d64faafde791aea00d9c6968a0a2cd49873e8e7a421c765da3813876a97ff3a4222ce811f4352aa62277469d890430dfa59f2
+SHA512 (jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz) = cbd05728395d09b4d69ecfee6eb737262d199e0bbc8ad047c1912cbb23dd2434753f2a7070a9a71aa6cd8e09ff0badd8a25c9e1ec512936ffd234e530baae357
 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d