summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lass2020-03-24 08:58:19 +0100
committerMichael Lass2020-03-24 08:58:19 +0100
commit70b5d7cf65e13b89b9ef4f8406f4120026a8ddbd (patch)
tree4fe84c78932d8d039e345bd8516bacc8ca733ceb
parentb34cf05643221c4b966b2d5d5bb30e5c612ddfc0 (diff)
downloadaur-70b5d7cf65e13b89b9ef4f8406f4120026a8ddbd.tar.gz
Fix version in desktop and install files
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--freedesktop-java.desktop6
-rw-r--r--freedesktop-jconsole.desktop6
-rw-r--r--freedesktop-jshell.desktop6
-rw-r--r--install_jdk-adoptopenjdk.sh2
6 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9b6625886256..2ba764caa608 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = jdk-adoptopenjdk
pkgdesc = OpenJDK Java 14 development kit (AdoptOpenJDK build)
pkgver = 14.u36
- pkgrel = 1
+ pkgrel = 2
url = https://adoptopenjdk.net/
install = install_jdk-adoptopenjdk.sh
arch = x86_64
@@ -48,9 +48,9 @@ pkgbase = jdk-adoptopenjdk
source = freedesktop-jconsole.desktop
source = freedesktop-jshell.desktop
sha256sums = 6c06853332585ab58834d9e8a02774b388e6e062ef6c4084b4f058c67f2e81b5
- sha256sums = 9b11bbaf5834748fc9a30cb887c129b32f34a81535dc512ff47b26ae72c91927
- sha256sums = 16551b98abbd5cbb9da14157df60afd2a608602c6e3734e979d9574e0780f8da
- sha256sums = 7d46b5ffcb2528f039b4534dddeab4b87de92106c25ff17e175570edde52f1c9
+ sha256sums = e5853506c880f0c68372a0be0acfd8852dd1a1d414352155c1cd4ad49ce3c248
+ sha256sums = a645b7079c572dabe18f2ea6c2cbdef00866b8b8e22a82530858ea49e2cf8343
+ sha256sums = b8705290f505cb368c204eb02c179fc1b10e70554903fb04b7dbe809dd1bed01
pkgname = jdk-adoptopenjdk
diff --git a/PKGBUILD b/PKGBUILD
index 740841d4d92b..6c35353ec9f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_majorver=14
_completever=14
_updatever=36
-pkgrel=1
+pkgrel=2
pkgver=${_completever}.u${_updatever}
_tag_ver=${_completever}+${_updatever}
@@ -59,9 +59,9 @@ source=(https://github.com/AdoptOpenJDK/openjdk${_majorver}-binaries/releases/do
freedesktop-jconsole.desktop
freedesktop-jshell.desktop)
sha256sums=('6c06853332585ab58834d9e8a02774b388e6e062ef6c4084b4f058c67f2e81b5'
- '9b11bbaf5834748fc9a30cb887c129b32f34a81535dc512ff47b26ae72c91927'
- '16551b98abbd5cbb9da14157df60afd2a608602c6e3734e979d9574e0780f8da'
- '7d46b5ffcb2528f039b4534dddeab4b87de92106c25ff17e175570edde52f1c9')
+ 'e5853506c880f0c68372a0be0acfd8852dd1a1d414352155c1cd4ad49ce3c248'
+ 'a645b7079c572dabe18f2ea6c2cbdef00866b8b8e22a82530858ea49e2cf8343'
+ 'b8705290f505cb368c204eb02c179fc1b10e70554903fb04b7dbe809dd1bed01')
_jvmdir=/usr/lib/jvm/java-${_majorver}-adoptopenjdk
_jdkdir=jdk-${_tag_ver}
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
index f8dc0114ca2f..b0943bb25a9d 100644
--- a/freedesktop-java.desktop
+++ b/freedesktop-java.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=AdoptOpenJDK Java 12 Runtime
-Comment=AdoptOpenJDK Java 12 Runtime
+Name=AdoptOpenJDK Java 14 Runtime
+Comment=AdoptOpenJDK Java 14 Runtime
Keywords=java;runtime
-Exec=/usr/lib/jvm/java-12-adoptopenjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-14-adoptopenjdk/bin/java -jar
Terminal=false
Type=Application
MimeType=application/x-java-archive;application/java-archive;application/x-jar;
diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop
index cc6c6dc59c26..c6022819d678 100644
--- a/freedesktop-jconsole.desktop
+++ b/freedesktop-jconsole.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=AdoptOpenJDK Java 12 Console
-Comment=AdoptOpenJDK Java 12 Monitoring & Management Console
+Name=AdoptOpenJDK Java 14 Console
+Comment=AdoptOpenJDK Java 14 Monitoring & Management Console
Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-12-adoptopenjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-14-adoptopenjdk/bin/jconsole
Terminal=false
Type=Application
Categories=Application;System;
diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop
index ab7e859f50aa..e0630f9139f9 100644
--- a/freedesktop-jshell.desktop
+++ b/freedesktop-jshell.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-Name=AdoptOpenJDK Java 12 Shell
-Comment=AdoptOpenJDK Java 12 Shell
+Name=AdoptOpenJDK Java 14 Shell
+Comment=AdoptOpenJDK Java 14 Shell
Keywords=java;shell
-Exec=/usr/lib/jvm/java-12-adoptopenjdk/bin/jshell
+Exec=/usr/lib/jvm/java-14-adoptopenjdk/bin/jshell
Terminal=true
Type=Application
Categories=Application;System;
diff --git a/install_jdk-adoptopenjdk.sh b/install_jdk-adoptopenjdk.sh
index a4a3ed95301e..3346492e3bbf 100644
--- a/install_jdk-adoptopenjdk.sh
+++ b/install_jdk-adoptopenjdk.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-12-adoptopenjdk'
+THIS_JDK='java-14-adoptopenjdk'
fix_default() {
if [ ! -x /usr/bin/java ]; then