Fix download URLs

2 files changed, 9 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 060750136197..cd7aa1f9857a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -56,13 +56,13 @@ pkgbase = liberica-jdk-full-bin
 	sha1sums = b8233f9ff931ce97a265827fac18ed90f4e248c6
 	sha1sums = a0da2952bc87a425182c3ac88e88649fbaa7cb65
 	sha1sums = eb36aa73a9be98164447774217865b91e79d503c
-	source_aarch64 = https://download.bell-sw.com/java/17+12/bellsoft-jdk17+12-linux-aarch64-full.tar.gz
+	source_aarch64 = https://download.bell-sw.com/java/17.0.1+12/bellsoft-jdk17.0.1+12-linux-aarch64-full.tar.gz
 	sha1sums_aarch64 = 2d3c885cf101b0378679475df2eeb671966b0977
-	source_armv7h = https://download.bell-sw.com/java/17+12/bellsoft-jdk17+12-linux-arm32-vfp-hflt-full.tar.gz
+	source_armv7h = https://download.bell-sw.com/java/17.0.1+12/bellsoft-jdk17.0.1+12-linux-arm32-vfp-hflt-full.tar.gz
 	sha1sums_armv7h = c17bf117349fa5a06e26dcbd8c0622bb5078007d
-	source_armv8h = https://download.bell-sw.com/java/17+12/bellsoft-jdk17+12-linux-arm32-vfp-hflt-full.tar.gz
+	source_armv8h = https://download.bell-sw.com/java/17.0.1+12/bellsoft-jdk17.0.1+12-linux-arm32-vfp-hflt-full.tar.gz
 	sha1sums_armv8h = c17bf117349fa5a06e26dcbd8c0622bb5078007d
-	source_x86_64 = https://download.bell-sw.com/java/17+12/bellsoft-jdk17+12-linux-amd64-full.tar.gz
+	source_x86_64 = https://download.bell-sw.com/java/17.0.1+12/bellsoft-jdk17.0.1+12-linux-amd64-full.tar.gz
 	sha1sums_x86_64 = 80a97d1de3a42a47c65a3ae389a4f200cfacf5d5
 
 pkgname = liberica-jdk-full-bin
diff --git a/PKGBUILD b/PKGBUILD
index 56db32b203d3..37e80661bc1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,7 @@
 _jdkname=liberica-jdk-full
 pkgname="${_jdkname}-bin"
 _java_ver=17
-_java_rel=12
-pkgver=${_java_ver}.0.1+${_java_rel}
-_pkgver=${_java_ver}+${_java_rel}
+pkgver=${_java_ver}.0.1+12
 pkgrel=1
 pkgdesc='BellSoft builds of OpenJDK are fully certified and 100% open source Java Development Kits (JDKs) for all Java development and production workloads. Full version includes OpenJFX.'
 arch=(aarch64 armv7h armv8h x86_64)
@@ -63,10 +61,10 @@ sha1sums=(19873c53aaf234d215b9892450bfd4e95c13ed7c
           a0da2952bc87a425182c3ac88e88649fbaa7cb65
           eb36aa73a9be98164447774217865b91e79d503c)
 
-source_aarch64=(https://download.bell-sw.com/java/$_pkgver/bellsoft-jdk$_pkgver-linux-aarch64-full.tar.gz)
-source_armv7h=(https://download.bell-sw.com/java/$_pkgver/bellsoft-jdk$_pkgver-linux-arm32-vfp-hflt-full.tar.gz)
+source_aarch64=(https://download.bell-sw.com/java/$pkgver/bellsoft-jdk$pkgver-linux-aarch64-full.tar.gz)
+source_armv7h=(https://download.bell-sw.com/java/$pkgver/bellsoft-jdk$pkgver-linux-arm32-vfp-hflt-full.tar.gz)
 source_armv8h=(${source_armv7h[@]})
-source_x86_64=(https://download.bell-sw.com/java/$_pkgver/bellsoft-jdk$_pkgver-linux-amd64-full.tar.gz)
+source_x86_64=(https://download.bell-sw.com/java/$pkgver/bellsoft-jdk$pkgver-linux-amd64-full.tar.gz)
 
 # Upstream-provided
 sha1sums_aarch64=('2d3c885cf101b0378679475df2eeb671966b0977')
@@ -83,7 +81,7 @@ prepare() {
 }
 
 package() {
-  cd jdk-${_pkgver/+*}-full
+  cd jdk-${pkgver/+*}-full
 
   install -dm 755 "${pkgdir}/${_jvmdir}"
   cp -a . "${pkgdir}/${_jvmdir}/"