summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkhsjdhjs2022-12-04 14:26:08 +0100
committerjkhsjdhjs2022-12-04 14:26:08 +0100
commit51bcd0a9ee979ace9ffc0a88719b7e7e6822fa96 (patch)
treedb1a88608466b643b77057f7f7e610cb7205ead1
parentdac59a8f1dc38a6c6f4fea3847920a6040fe6efa (diff)
downloadaur-51bcd0a9ee979ace9ffc0a88719b7e7e6822fa96.tar.gz
Set JDK with JAVA_HOME instead of archlinux-java
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
2 files changed, 6 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 32192fec106c..ece8a301d38f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,9 +6,7 @@ pkgbase = nzbhydra2
arch = any
license = Apache
makedepends = maven
- makedepends = java-environment<=16
- makedepends = java-environment>=8
- makedepends = java-runtime-common
+ makedepends = java-environment=11
depends = python
depends = java-runtime-headless<=17
depends = java-runtime-headless>=8
diff --git a/PKGBUILD b/PKGBUILD
index 48674b09746b..c440abcea0b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ arch=('any')
url="https://github.com/theotherp/nzbhydra2"
license=('Apache')
depends=('python' 'java-runtime-headless<=17' 'java-runtime-headless>=8')
-makedepends=('maven' 'java-environment<=16' 'java-environment>=8' 'java-runtime-common')
+makedepends=('maven' 'java-environment=11')
optdepends=('jackett: torrent indexer proxy')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/theotherp/nzbhydra2/archive/refs/tags/v${pkgver}.tar.gz"
'nzbhydra2.service'
@@ -41,21 +41,16 @@ prepare() {
}
build() {
- _java_version="$(archlinux-java get)"
- if [[ "${_java_version//[!0-9]}" -gt 16 ]]; then
- >&2 echo -e "This package can't be built with \e[1m$_java_version\e[21m!"
- >&2 echo -e "Use \e[1marchlinux-java\e[21m to change the default Java SDK."
- >&2 echo -e "\e[1mjava-11-openjdk\e[21m and \e[1mjava-8-openjdk\e[21m are known to work."
- >&2 archlinux-java status
- return 1
- fi
-
cd "${srcdir}/${pkgname}-${pkgver}"
+
+ export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
mvn -Dmaven.test.skip -pl core -am clean package
}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
+
+ export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
mvn -pl core -am test
}