Update to v5.1.0. and fix packaging

3 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3452fc275bf..ddbdff3cb81e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = nzbhydra2-nojava-bin
 	pkgdesc = Search aggregator for newznab and torznab indexers.
-	pkgver = 5.0.6
+	pkgver = 5.1.0
 	pkgrel = 1
 	url = https://github.com/theotherp/nzbhydra2
-	arch = any
+	arch = x86_64
+	arch = aarch64
 	license = Apache
 	depends = python
 	optdepends = jackett: torrent indexer proxy
 	provides = nzbhydra2
 	conflicts = nzbhydra2
-	source = https://github.com/theotherp/nzbhydra2/releases/download/v5.0.6/nzbhydra2-5.0.6-linux.zip
 	source = nzbhydra2.service
 	source = nzbhydra2.tmpfiles
 	source = nzbhydra2.sysusers
@@ -17,13 +17,16 @@ pkgbase = nzbhydra2-nojava-bin
 	source = wrapper-remove-base-path-checks.patch
 	source = wrapper-remove-update-support.patch
 	source = wrapper-remove-release-type-detection.patch
-	sha256sums = 23251a8c72cbebd152b78931fed3d7edd2ebbec6e4a9817ed4875757c600b28a
 	sha256sums = dc66acae9ec02f3e8a16653b1b8e1d35be6bfded46b1649a4db53541fbdd739f
 	sha256sums = a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003
 	sha256sums = 8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a
 	sha256sums = 8127f92afb0f70b6f79c11db0219f8b2557cb7bcafa16fd6ddb2d61166d216fe
 	sha256sums = 5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4
 	sha256sums = 35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73
-	sha256sums = defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2
+	sha256sums = 73fe3e7d877f4f9f301deef9f699a357a9a1574148aedb565832f0375c99bdda
+	source_x86_64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.0/nzbhydra2-5.1.0-amd64-linux.zip
+	sha256sums_x86_64 = 6649f3cf283342bdaa8afec0e0a3ca85a0172e581554c60cd5360d6415ceb615
+	source_aarch64 = https://github.com/theotherp/nzbhydra2/releases/download/v5.1.0/nzbhydra2-5.1.0-arm64-linux.zip
+	sha256sums_aarch64 = 43c93cbc91502c8fa4b9a7555ace03b04bc99d01b83240c9b0777440498cc76c
 
 pkgname = nzbhydra2-nojava-bin
diff --git a/PKGBUILD b/PKGBUILD
index 670f8066c5ed..5cb1a5bf00bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,37 @@
 # Maintainer: Gee
-
-# From nzbhydra2-bin:
-# Maintainer: Donald Webster <fryfrog@gmail.com>
-# Maintainer: Daniel Egeberg <daniel.egeberg@gmail.com>
 # Co-Maintainer: Leon Möller <jkhsjdhjs at totally dot rip>
 
 pkgname="nzbhydra2-nojava-bin"
-pkgver=5.0.6
+pkgver=5.1.0
 pkgrel=1
 pkgdesc="Search aggregator for newznab and torznab indexers."
-arch=('any')
+arch=('x86_64' 'aarch64')
 url="https://github.com/theotherp/nzbhydra2"
 license=('Apache')
 provides=('nzbhydra2')
 conflicts=('nzbhydra2')
 depends=('python')
 optdepends=('jackett: torrent indexer proxy')
-source=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname%-nojava-bin}-${pkgver}-linux.zip"
-        'nzbhydra2.service'
+
+source=('nzbhydra2.service'
         'nzbhydra2.tmpfiles'
         'nzbhydra2.sysusers'
         'nzbhydra2.sh'
         'wrapper-remove-base-path-checks.patch'
         'wrapper-remove-update-support.patch'
         'wrapper-remove-release-type-detection.patch')
+source_x86_64=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname%-nojava-bin}-${pkgver}-amd64-linux.zip")
+source_aarch64=("https://github.com/theotherp/nzbhydra2/releases/download/v${pkgver}/${pkgname%-nojava-bin}-${pkgver}-arm64-linux.zip")
 
-sha256sums=('23251a8c72cbebd152b78931fed3d7edd2ebbec6e4a9817ed4875757c600b28a'
-            'dc66acae9ec02f3e8a16653b1b8e1d35be6bfded46b1649a4db53541fbdd739f'
+sha256sums=('dc66acae9ec02f3e8a16653b1b8e1d35be6bfded46b1649a4db53541fbdd739f'
             'a9ceeed2b50d55c5e554c0d4c615e855fe4d3889eb118e37908fa04ffb7cb003'
             '8f91eb4f98f7f5c11590b29b1394dfa7ca62ad115feeac4f402c9ac094fb925a'
             '8127f92afb0f70b6f79c11db0219f8b2557cb7bcafa16fd6ddb2d61166d216fe'
             '5660f26303826a0b8bf3f7c198c39e345e87b799e2304a79db5a77992d09cda4'
             '35100f4e7ab5a480f5554d9abd32e8abac20d56f873f82ecbc906d0b3fdadc73'
-            'defb77e7b19c6abfc8380cd175bc04062a0c52d1042b8e02173133367152c8e2')
+            '73fe3e7d877f4f9f301deef9f699a357a9a1574148aedb565832f0375c99bdda')
+sha256sums_x86_64=('6649f3cf283342bdaa8afec0e0a3ca85a0172e581554c60cd5360d6415ceb615')
+sha256sums_aarch64=('43c93cbc91502c8fa4b9a7555ace03b04bc99d01b83240c9b0777440498cc76c')
 
 prepare() {
     patch "${srcdir}/nzbhydra2wrapperPy3.py" < "${srcdir}/wrapper-remove-base-path-checks.patch"
@@ -41,10 +40,9 @@ prepare() {
 }
 
 package() {
-    install -D -m 755 "${srcdir}/nzbhydra2.sh" "${pkgdir}/usr/bin/nzbhydra2.sh"
+    install -D -m 755 "${srcdir}/nzbhydra2.sh" "${pkgdir}/usr/bin/nzbhydra2"
     install -D -m 755 "${srcdir}/nzbhydra2wrapperPy3.py" "${pkgdir}/usr/lib/nzbhydra2/nzbhydra2wrapperPy3.py"
-    install -D -m 755 "${srcdir}/nzbhydra2" "${pkgdir}/usr/bin/nzbhydra2"
-    install -D -m 755 "${srcdir}/core" "${pkgdir}/usr/bin/core"
+    install -D -m 755 "${srcdir}/core" "${pkgdir}/usr/lib/nzbhydra2/core"
     install -D -m 644 "${srcdir}/readme.md" "${pkgdir}/usr/share/doc/nzbhydra2/readme.md"
 
     install -D -m 644 "${srcdir}/nzbhydra2.service" "${pkgdir}/usr/lib/systemd/system/nzbhydra2.service"
diff --git a/wrapper-remove-release-type-detection.patch b/wrapper-remove-release-type-detection.patch
index ef07e3de34bb..e8ce1aa18c15 100644
--- a/wrapper-remove-release-type-detection.patch
+++ b/wrapper-remove-release-type-detection.patch
@@ -18,7 +18,7 @@ index e64c80d4..bd9e57ba 100644
 -        sys.exit(-1)
 -    logger.info("Determined release type: " + releaseType)
 -    return releaseType
-+    return ReleaseType.GENERIC
++    return ReleaseType.NATIVE
  
  
  def escape_parameter(is_windows, parameter):