Remove "U" fix java home for apks.

adoptium · Sep 18, 2023 · 7b51b0b · 7b51b0b
1 parent ecb7d78
commit 7b51b0b
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 34 deletions.
diff --git a/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD
@@ -26,14 +26,14 @@ makedepends="
 depends=""
 subpackages="$pkgname-src:_src:noarch
 	$pkgname-jdk:_jdk:x86_64"
-source="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
+source="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
 
 	HelloWorld.java
 	TestECDSA.java
 	TestCryptoLevel.java
 "
 
-_java_home="/usr/lib/jvm/java-19-temurin"
+_java_home="/usr/lib/jvm/java-20-temurin"
 
 ldpath="$_java_home/lib:$_java_home/lib/server"
 sonameprefix="$pkgname:"
@@ -95,7 +95,7 @@ _jdk() {
 }
 
 sha256sums="
-b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306  OpenJDK21U-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
+b03aced4b7a1c49bc00297e35e45480fd03818862b93e17e1551a3b721e89306  OpenJDK21-jdk_x64_alpine-linux_hotspot_$_pkgver.tar.gz
 e9185736dde99a4dc570a645a20407bdb41c1f48dfc34d9c3eb246cf0435a378  HelloWorld.java
 22d2ff9757549ebc64e09afd3423f84b5690dcf972cd6535211c07c66d38fab0  TestCryptoLevel.java
 9fb00c7b0220de8f3ee2aa398459a37d119f43fd63321530a00b3bb9217dd933  TestECDSA.java

diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules
@@ -3,9 +3,9 @@
 pkg_name = temurin-21-jdk
 priority = 2100
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd jwebserver keytool rmiregistry serialver jexec jspawnhelper
-amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21U-jdk_x64_linux_hotspot_21.0.0_35.tar.gz
+amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21-jdk_x64_linux_hotspot_21.0.0_35.tar.gz
 amd64_checksum = 3d91842e9c172967ac397076523249d05a82ead51b0006838f5f0315ad52222c
-arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.0_35.tar.gz
+arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21-jdk_aarch64_linux_hotspot_21.0.0_35.tar.gz
 arm64_checksum = b475bcc23db0bd618c815bb8f11d8e084dc58288ea3bcdf4e7f389ed41c89f56
 
 d = debian/$(pkg_name)

diff --git a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -96,14 +96,14 @@ Provides: java-sdk-21-%{java_provides}
 Provides: java-sdk-%{java_provides}
 
 # First architecture (x86_64)
-Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Second architecture (ppc64le)
-#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Third architecture (aarch64)
-Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 
 # Set the compression format to xz to be compatible with more Red Hat flavours. Newer versions of Fedora use zstd which
 # is not available on CentOS 7, for example. https://github.com/rpm-software-management/rpm/blob/master/macros.in#L353

diff --git a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -96,14 +96,14 @@ Provides: java-sdk-21-%{java_provides}
 Provides: java-sdk-%{java_provides}
 
 # First architecture (x86_64)
-Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Second architecture (ppc64le)
-#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Third architecture (aarch64)
-Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 
 # Avoid build failures on some distros due to missing build-id in binaries.
 %global debug_package %{nil}

diff --git a/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD
@@ -25,10 +25,10 @@ makedepends="
 "
 depends=""
 subpackages="$pkgname-jre:_jre:x86_64"
-source="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21U-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz
+source="https://github.com/adoptium/temurin21-binaries/releases/download/jdk-$_pkgvername/OpenJDK21-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz
 "
 
-_java_home="/usr/lib/jvm/java-21-temurin-jre"
+_java_home="/usr/lib/jvm/java-20-temurin-jre"
 
 ldpath="$_java_home/lib:$_java_home/lib/server"
 sonameprefix="$pkgname:"
@@ -71,5 +71,5 @@ _jre() {
 }
 
 sha256sums="
-53b34747a3c042a4cccb2b8b78fba3330b105bc523f0861237baa9143dc39115  OpenJDK21U-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz
+53b34747a3c042a4cccb2b8b78fba3330b105bc523f0861237baa9143dc39115  OpenJDK21-jre_x64_alpine-linux_hotspot_$_pkgver.tar.gz
 "
diff --git a/linux/jre/debian/src/main/packaging/temurin/21/debian/rules b/linux/jre/debian/src/main/packaging/temurin/21/debian/rules
@@ -3,9 +3,9 @@
 pkg_name = temurin-21-jre
 priority = 2100
 jvm_tools = java jfr jrunscript jwebserver keytool rmiregistry
-amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B35/OpenJDK21U-jre_x64_linux_hotspot_21.0.0_35.tar.gz
+amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B35/OpenJDK21-jre_x64_linux_hotspot_21.0.0_35.tar.gz
 amd64_checksum = e3592e86290c192804d9c6b5035d42cc32cf04141d1c0b9d1ecb67739826c8c5
-arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.0_35.tar.gz
+arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.0%2B35/OpenJDK21-jre_aarch64_linux_hotspot_21.0.0_35.tar.gz
 arm64_checksum = 63a730d5a3b6d21d31f7cba15dc44b019a8a4d8652e13acec45040f98584112c
 
 d = debian/$(pkg_name)

diff --git a/linux/jre/redhat/src/main/packaging/temurin/21/temurin-21-jre.spec b/linux/jre/redhat/src/main/packaging/temurin/21/temurin-21-jre.spec
@@ -86,14 +86,14 @@ Provides: jre-%{java_provides}
 Provides: jre-%{java_provides}-headless
 
 # First architecture (x86_64)
-Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Second architecture (ppc64le)
-#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Third architecture (aarch64)
-Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 
 # Set the compression format to xz to be compatible with more Red Hat flavours. Newer versions of Fedora use zstd which
 # is not available on CentOS 7, for example. https://github.com/rpm-software-management/rpm/blob/master/macros.in#L353

diff --git a/linux/jre/suse/src/main/packaging/temurin/21/temurin-21-jre.spec b/linux/jre/suse/src/main/packaging/temurin/21/temurin-21-jre.spec
@@ -86,14 +86,14 @@ Provides: jre-%{java_provides}
 Provides: jre-%{java_provides}-headless
 
 # First architecture (x86_64)
-Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Second architecture (ppc64le)
-#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+#Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+#Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Third architecture (aarch64)
-Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
-Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 
 # Avoid build failures on some distros due to missing build-id in binaries.
 %global debug_package %{nil}