From 3e38cf3555d8b3539655721cc55cb82b2fc43ef08aa10eb5e344c609d4c5cc3b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sat, 5 Mar 2022 07:38:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=402

---
 aarch32-git.tar.xz      |  3 +++
 aarch32.tar.xz          |  3 ---
 corba.tar.xz            |  3 ---
 hotspot.tar.xz          |  3 ---
 icedtea-3.21.0.tar.xz   |  3 ---
 icedtea-3.22.0.tar.xz   |  3 +++
 java-1_8_0-openjdk.spec | 35 ++++++++++-------------------------
 jaxp.tar.xz             |  3 ---
 jaxws.tar.xz            |  3 ---
 jdk.tar.xz              |  3 ---
 langtools.tar.xz        |  3 ---
 nashorn.tar.xz          |  3 ---
 openjdk-git.tar.xz      |  3 +++
 openjdk.tar.xz          |  3 ---
 shenandoah-git.tar.xz   |  3 +++
 shenandoah.tar.xz       |  3 ---
 16 files changed, 22 insertions(+), 58 deletions(-)
 create mode 100644 aarch32-git.tar.xz
 delete mode 100644 aarch32.tar.xz
 delete mode 100644 corba.tar.xz
 delete mode 100644 hotspot.tar.xz
 delete mode 100644 icedtea-3.21.0.tar.xz
 create mode 100644 icedtea-3.22.0.tar.xz
 delete mode 100644 jaxp.tar.xz
 delete mode 100644 jaxws.tar.xz
 delete mode 100644 jdk.tar.xz
 delete mode 100644 langtools.tar.xz
 delete mode 100644 nashorn.tar.xz
 create mode 100644 openjdk-git.tar.xz
 delete mode 100644 openjdk.tar.xz
 create mode 100644 shenandoah-git.tar.xz
 delete mode 100644 shenandoah.tar.xz

diff --git a/aarch32-git.tar.xz b/aarch32-git.tar.xz
new file mode 100644
index 0000000..3309b82
--- /dev/null
+++ b/aarch32-git.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ed42fe4dc77ce0fcc7894512ebe04aa6ca8507c23cc19e1f10cdbb15691ff05
+size 7216040
diff --git a/aarch32.tar.xz b/aarch32.tar.xz
deleted file mode 100644
index 9bac412..0000000
--- a/aarch32.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee670f481885dd512714af1caed93473b51dab8934b9b71f80d7f0d7adc02313
-size 7207712
diff --git a/corba.tar.xz b/corba.tar.xz
deleted file mode 100644
index c8de922..0000000
--- a/corba.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab0bff4445822c5e5741088da0e83a9bc20d059b8a95fcffd5885c03969bbeeb
-size 949700
diff --git a/hotspot.tar.xz b/hotspot.tar.xz
deleted file mode 100644
index 539afc9..0000000
--- a/hotspot.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4231a4b534b1c44aaf5e0b51833f0e40f0654dcaa41c6259cf65037eccd427ae
-size 7121192
diff --git a/icedtea-3.21.0.tar.xz b/icedtea-3.21.0.tar.xz
deleted file mode 100644
index 9a9cb82..0000000
--- a/icedtea-3.21.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f83ee85d39f39a304dbd6c79aaeb4fa04257fc2e61031d0a28587a1953ba2459
-size 1574548
diff --git a/icedtea-3.22.0.tar.xz b/icedtea-3.22.0.tar.xz
new file mode 100644
index 0000000..5a9a904
--- /dev/null
+++ b/icedtea-3.22.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82bffbe2b04ad8b733f7c796ae8d40ece2437adb1d4e614b8391ab44fc7f175b
+size 1567796
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 3583c10..6925a73 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -18,7 +18,7 @@
 
 %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %global jit_arches %{ix86} x86_64 ppc64 ppc64le %{aarch64} %{arm}
-%global icedtea_version 3.21.0
+%global icedtea_version 3.22.0
 %global buildoutputdir openjdk.build/
 # Convert an absolute path to a relative path.  Each symbolic link is
 # specified relative to the directory in which it is installed so that
@@ -31,8 +31,8 @@
 # priority must be 6 digits in total
 %global priority        1805
 %global javaver         1.8.0
-%global updatever       312
-%global buildver        07
+%global updatever       322
+%global buildver        06
 # Standard JPackage directories and symbolic links.
 %global sdklnk          java-%{javaver}-openjdk
 %global archname        %{sdklnk}
@@ -166,16 +166,9 @@ License:        Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only
 Group:          Development/Languages/Java
 URL:            https://openjdk.java.net/
 Source0:        https://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz
-Source1:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/openjdk.tar.xz
-Source2:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/corba.tar.xz
-Source3:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxp.tar.xz
-Source4:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jaxws.tar.xz
-Source5:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/jdk.tar.xz
-Source6:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/langtools.tar.xz
-Source7:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/hotspot.tar.xz
-Source8:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/aarch32.tar.xz
-Source9:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/shenandoah.tar.xz
-Source10:       https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/nashorn.tar.xz
+Source1:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/openjdk-git.tar.xz
+Source2:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/aarch32-git.tar.xz
+Source3:        https://icedtea.classpath.org/download/drops/icedtea8/%{icedtea_version}/shenandoah-git.tar.xz
 # nss fips configuration file
 Source17:       nss.fips.cfg.in
 # RPM/distribution specific patches
@@ -501,23 +494,15 @@ sh autogen.sh
 %else
         --disable-improved-font-rendering \
 %endif
-        --with-openjdk-src-zip=%{SOURCE1} \
-        --with-corba-src-zip=%{SOURCE2} \
-        --with-jaxp-src-zip=%{SOURCE3} \
-        --with-jaxws-src-zip=%{SOURCE4} \
-        --with-jdk-src-zip=%{SOURCE5} \
-        --with-langtools-src-zip=%{SOURCE6} \
 %ifarch %{arm}
-        --with-hotspot-src-zip=%{SOURCE8} \
+        --with-hotspot-src-zip=%{SOURCE2} \
 %else
-%if %{with zero} || %{without shenandoah}
-        --with-hotspot-src-zip=%{SOURCE7} \
-%else
-        --with-hotspot-src-zip=%{SOURCE9} \
+%if %{without zero} && %{with shenandoah}
+        --with-hotspot-src-zip=%{SOURCE3} \
         --with-hotspot-build=shenandoah \
 %endif
 %endif
-        --with-nashorn-src-zip=%{SOURCE10}
+        --with-openjdk-src-zip=%{SOURCE1}
 
 make patch %{?_smp_mflags}
 
diff --git a/jaxp.tar.xz b/jaxp.tar.xz
deleted file mode 100644
index 75c8e0e..0000000
--- a/jaxp.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5bb8b86a8d24ca7abde8f6cf15dec18c6e9a5201e4942a7ef117b28c960f54f
-size 2269276
diff --git a/jaxws.tar.xz b/jaxws.tar.xz
deleted file mode 100644
index 93ce233..0000000
--- a/jaxws.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a1244d4b8c0f78d34e44edb92a96cb127ec4b43847a6d5a176c37f392499993
-size 2278396
diff --git a/jdk.tar.xz b/jdk.tar.xz
deleted file mode 100644
index 1f3f7bb..0000000
--- a/jdk.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eab27c3ad455b68b29fec2f59730d48c97f53699000da21a5e1640b825840385
-size 40714380
diff --git a/langtools.tar.xz b/langtools.tar.xz
deleted file mode 100644
index eba2fb7..0000000
--- a/langtools.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:499c749aa8dbe120bde899d0712d47e3cebc7d4a0a4b4c9b6afb2b0bdda98b82
-size 2081452
diff --git a/nashorn.tar.xz b/nashorn.tar.xz
deleted file mode 100644
index 7a51e85..0000000
--- a/nashorn.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:495276d1e1e6b3a5a0d257c21b2e6349b000ac083be209a47a01b45894a65d59
-size 2324264
diff --git a/openjdk-git.tar.xz b/openjdk-git.tar.xz
new file mode 100644
index 0000000..e6ccd95
--- /dev/null
+++ b/openjdk-git.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e01e9e90b9ca881ffd766d66b96d40ab991092644e7e8f3535c09004c9dd27ed
+size 58126588
diff --git a/openjdk.tar.xz b/openjdk.tar.xz
deleted file mode 100644
index 8efd4a4..0000000
--- a/openjdk.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea3fe2097a0ce02e6781e8a0cc1b923ab52803a527cc34ef686779c04a3e1c21
-size 367068
diff --git a/shenandoah-git.tar.xz b/shenandoah-git.tar.xz
new file mode 100644
index 0000000..bc42854
--- /dev/null
+++ b/shenandoah-git.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:738881bf26ecc072241f892441fc15a7150a02e00be80846ed520d31dab029aa
+size 7298496
diff --git a/shenandoah.tar.xz b/shenandoah.tar.xz
deleted file mode 100644
index 2e5daf1..0000000
--- a/shenandoah.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:635da162c98b27d370da21a5544d948b2cbb3dfba5b14433c1c1f51f9ab49793
-size 7295776