From cadeb47ec0edcd36f9620b3533d95b9cbd4bd976 Mon Sep 17 00:00:00 2001
From: Petra Mikova <pmikova@redhat.com>
Date: Mon, 26 Oct 2020 09:00:30 +0100
Subject: [PATCH] October CPU 2020 update

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

diff --git a/.gitignore b/.gitignore
index 9398831..0c8be46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /jdk-updates-jdk14u-jdk-14.0.1+7.tar.xz
 /jdk-updates-jdk14u-jdk-14.0.2+12.tar.xz
 /jdk-jdk15-jdk-15+36.tar.xz
+/jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz
diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec
index 31959d7..4446952 100644
--- a/java-latest-openjdk.spec
+++ b/java-latest-openjdk.spec
@@ -229,7 +229,7 @@
 # Used via new version scheme. JDK 15 was
 # GA'ed in September 2020 => 20.9
 %global vendor_version_string 20.9
-%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
@@ -244,8 +244,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        36
-%global rpmrelease      4
+%global buildver        9
+%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} )
@@ -1042,7 +1042,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
@@ -1771,7 +1771,7 @@ if ! echo $suffix | grep -q "debug" ; then
   install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
   cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
   built_doc_archive=jdk-%{majorver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
-  cp -a %{buildoutputdir -- $suffix}/bundles/${built_doc_archive} $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
@@ -2039,6 +2039,9 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Sun Oct 25 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:15.0.1.9-1.rolling
+- updated to October CPU 2020 sources
+
 * Thu Oct 22 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:15.0.0.36-4.rolling
 - Fix directory ownership of -static-libs sub-package.
 
diff --git a/sources b/sources
index 06d0547..eb2292c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jdk-jdk15-jdk-15+36.tar.xz) = 0c03c5cdcfc7798e3a8026b1e86fa283a5c17cc2638f25e80a4eab9a0c82d3cf43d28f574cce237c9ba6129a722f10db5f66b163edabf589b9cc90365ce3a5a7
+SHA512 (jdk-updates-jdk15u-jdk-15.0.1+9.tar.xz) = acc488cf608d8104342e4fd88ddf8bb06d8674a2640d049a482cd0aaf8bf4e3acdbf78388f71fa87bbc177ce66ba182483340f787b8e13e5ca0cca0d4b62f938
 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d