Minor fixex. Version bump to 1.0.4

2 files changed, 17 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a046d9a51265..e68b6abf6692 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = jcryptool
 	pkgdesc = e-learning application for applying and analysing cryptographic algorithms
-	pkgver = 1.0.3
+	pkgver = 1.0.4
 	pkgrel = 1
 	url = https://www.cryptool.org/en/jcryptool
 	arch = x86_64
 	license = EPL
-	depends = java-runtime
+	depends = jre11-openjdk
 	depends = libxext
 	depends = libxrender
 	depends = fontconfig
-	source = https://github.com/jcryptool/core/releases/download/v1.0.3/jcryptool-1.0.3-Linux-64bit.tar.gz
+	source = https://github.com/jcryptool/core/releases/download/1.0.4/jcryptool-1.0.4-Linux-64bit.tar.gz
 	source = jcryptool.desktop
 	source = jcryptool-16.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_16x16.png
 	source = jcryptool-24.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_24x24.png
@@ -18,7 +18,7 @@ pkgbase = jcryptool
 	source = jcryptool-128.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_128x128.png
 	source = jcryptool-256.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_256x256.png
 	source = jcryptool-512.png::https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_512x512.png
-	sha512sums = 377052fccbbdcdc893dea58626e6f83dafda0f65cdb69e44d76f480b15929258e5588abf977c31706cbcb03b5269d0797b63e00e9d063d920c826834600fd6a7
+	sha512sums = aec84930a21a32efbf41d0760c4eb41cf7217f5b3bed2ca48990e454a192dcd9889627e2085088f59b687df6ac14c8032e9a04c806c80b3e458f3b8bceaf0594
 	sha512sums = 4b08c526016f27fa78bdcbe0f499236757c9e14e0548da8736d99b0d6f3e85fa7f84ac27b7f4922b2064802e92ec0e508848fb327a519b55f49bc5a0a9bda5e8
 	sha512sums = 02c728049ff612f4c77575aa557850d826fbf40b09e885a9de6e80429020b742f7193d7e0e572dff21a6bf091006f7d8fa7c377ea68b96ac01a60384b1dd1aff
 	sha512sums = 3df55b87975dc5ed5b475fc2cf9c55d21b29d1ec6ef34b8773b7e9c72ff39225c0ab6c34464b04ea57dd5b4d856d63686d78e0741c3f3a1300e276192c72a4c4
diff --git a/PKGBUILD b/PKGBUILD
index 1cb6d714f6e3..21d40f68646e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,15 @@
 # Contributor: tze <tze@datalove.me>
 
 pkgname=jcryptool
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="e-learning application for applying and analysing cryptographic algorithms"
 arch=('x86_64')
 url="https://www.cryptool.org/en/jcryptool"
 license=('EPL')
-depends=('java-runtime' 'libxext' 'libxrender' 'fontconfig')
+depends=('jre11-openjdk' 'libxext' 'libxrender' 'fontconfig')
 _iconsrc='https://github.com/jcryptool/doc/raw/bfc66c1e952809edada1936dc5122f45400170de/Graphics/Icons/png/JCT_Icon_png_'
-source=("https://github.com/jcryptool/core/releases/download/v1.0.3/${pkgname}-${pkgver}-Linux-64bit.tar.gz"
+source=("https://github.com/jcryptool/core/releases/download/${pkgver}/${pkgname}-${pkgver}-Linux-64bit.tar.gz"
         'jcryptool.desktop'
         "jcryptool-16.png::${_iconsrc}16x16.png"
         "jcryptool-24.png::${_iconsrc}24x24.png"
@@ -22,7 +22,7 @@ source=("https://github.com/jcryptool/core/releases/download/v1.0.3/${pkgname}-$
         "jcryptool-128.png::${_iconsrc}128x128.png"
         "jcryptool-256.png::${_iconsrc}256x256.png"
         "jcryptool-512.png::${_iconsrc}512x512.png")
-sha512sums=('377052fccbbdcdc893dea58626e6f83dafda0f65cdb69e44d76f480b15929258e5588abf977c31706cbcb03b5269d0797b63e00e9d063d920c826834600fd6a7'
+sha512sums=('aec84930a21a32efbf41d0760c4eb41cf7217f5b3bed2ca48990e454a192dcd9889627e2085088f59b687df6ac14c8032e9a04c806c80b3e458f3b8bceaf0594'
             '4b08c526016f27fa78bdcbe0f499236757c9e14e0548da8736d99b0d6f3e85fa7f84ac27b7f4922b2064802e92ec0e508848fb327a519b55f49bc5a0a9bda5e8'
             '02c728049ff612f4c77575aa557850d826fbf40b09e885a9de6e80429020b742f7193d7e0e572dff21a6bf091006f7d8fa7c377ea68b96ac01a60384b1dd1aff'
             '3df55b87975dc5ed5b475fc2cf9c55d21b29d1ec6ef34b8773b7e9c72ff39225c0ab6c34464b04ea57dd5b4d856d63686d78e0741c3f3a1300e276192c72a4c4'
@@ -32,10 +32,18 @@ sha512sums=('377052fccbbdcdc893dea58626e6f83dafda0f65cdb69e44d76f480b15929258e55
             '27bbfbce3d38f7ebbaa3e00d0f15626c9598fccef3d080e3ee3f20ec5de41c1d137d6dd0f2fcc605532fb5dd0615108f3d6ee098ad25be3ec35f765cb50fa1ea'
             '4b638f8df703fe670bc2f3b3b2d719249841e9c08665aece21b4bddaa8197ca06775799d44c6dcb6fbb74c3c8b858bd97f751c59478c17b558accec430a53c8e')
 
+prepare() {
+    cd "${srcdir}/jcryptool"
+    #remove bundle jre and use system jre instead
+    rm -R features/org.jcryptool.thirdparty.jre.linux64.*
+    sed -i '/^features\/org\.jcryptool\.thirdparty\.jre\.linux64\./c\\/usr\/lib\/jvm\/java-11-openjdk\/bin\/java' ./JCrypTool.ini
+}
+
 package() {
     mkdir -p "${pkgdir}"/{opt,usr/bin}
+
     cp -R "${srcdir}/jcryptool/" "${pkgdir}/opt/"
-    
+ 
     ln -s /opt/jcryptool/JCrypTool "${pkgdir}"/usr/bin/jcryptool
 
     install -Dm644 ${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop