update to 8.6.0

2 files changed, 44 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66b3847a996f..849d956b307e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,36 @@
 pkgbase = alerta
 	pkgdesc = A tool used to consolidate and de-duplicate alerts from multiple sources
-	pkgver = 8.3.3
+	pkgver = 8.6.0
 	pkgrel = 1
 	url = https://github.com/alerta/alerta
 	arch = any
 	license = APACHE
 	makedepends = python-setuptools
-	depends = python
+	depends = python>=3.6
+	depends = python-blinker
 	depends = python-bcrypt
 	depends = python-cryptography
-	depends = python-flask
-	depends = python-flask-cors
-	depends = python-flask-compress
+	depends = python-dateutil
+	depends = python-flask>=2.0.1
+	depends = python-flask-cors>=3.0.2
+	depends = python-flask-compress>=1.4.0
+	depends = python-mohawk
+	depends = python-pyaml
 	depends = python-pyjwt
+	depends = python-pymongo>=3.6
 	depends = python-pyparsing
-	depends = python-dateutil
 	depends = python-pytz
-	depends = python-pyaml
 	depends = python-requests
-	depends = python-sentry_sdk
-	depends = python-blinker
-	depends = python-pymongo
+	depends = python-requests-hawk
+	depends = python-sentry_sdk>=0.10.2
 	optdepends = python-psycopg2
 	optdepends = postgresql
 	optdepends = mongodb
-	source = https://github.com/alerta/alerta/archive/v8.3.3.tar.gz
+	source = alerta-8.6.0.tar.gz::https://github.com/alerta/alerta/archive/v8.6.0.tar.gz
 	source = alertad.service
 	source = alerta.sysusers
-	sha256sums = a964d63899080d3f4186e2de1a1415895e557239d18b1cce30da8b2a9568f600
+	sha256sums = 5f0795cfc81c412b057018a77d7ce3d6e3a19e1e8cd1f7b8b1b6bcb01b43d37e
 	sha256sums = 4449acb346807229e4cbfeed68d9ba6006a165e65dec09487fb6e627088016c2
 	sha256sums = f0a2f76266ba07275ab2baeab1497dfb2946305e85ae68e3b34dd14e2ac47423
 
 pkgname = alerta
-
diff --git a/PKGBUILD b/PKGBUILD
index af8e5d591fa4..11aa675d819f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,37 @@
-# Maintainer: Michael Clayfield <me@michaelclayfield.com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Michael Clayfield <me@michaelclayfield.com>
+
 pkgname=alerta
-pkgver=8.3.3
+pkgver=8.6.0
 pkgrel=1
 pkgdesc="A tool used to consolidate and de-duplicate alerts from multiple sources"
 arch=('any')
 url="https://github.com/alerta/alerta"
 license=('APACHE')
+depends=(
+	'python>=3.6'
+	'python-blinker'
+	'python-bcrypt'
+	'python-cryptography'
+	'python-dateutil'
+	'python-flask>=2.0.1'
+	'python-flask-cors>=3.0.2'
+	'python-flask-compress>=1.4.0'
+	'python-mohawk'
+	'python-pyaml'
+	'python-pyjwt'
+	'python-pymongo>=3.6'
+	'python-pyparsing'
+	'python-pytz'
+	'python-requests'
+	'python-requests-hawk'
+	'python-sentry_sdk>=0.10.2')
+optdepends=('python-psycopg2' 'postgresql' 'mongodb')
 makedepends=('python-setuptools')
-depends=('python' 'python-bcrypt' 'python-cryptography' 'python-flask' 'python-flask-cors' 'python-flask-compress' 'python-pyjwt' 'python-pyparsing' 'python-dateutil' 'python-pytz' 'python-pyaml' 'python-requests' 'python-sentry_sdk' 'python-blinker' 'python-pymongo') 
-optdepends=('python-psycopg2' 'postgresql' 'mongodb') 
-source=("https://github.com/alerta/alerta/archive/v$pkgver.tar.gz"
-	"${pkgname}d.service"
-	"${pkgname}.sysusers")
-sha256sums=('a964d63899080d3f4186e2de1a1415895e557239d18b1cce30da8b2a9568f600'
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        "alertad.service"
+        "alerta.sysusers")
+sha256sums=('5f0795cfc81c412b057018a77d7ce3d6e3a19e1e8cd1f7b8b1b6bcb01b43d37e'
             '4449acb346807229e4cbfeed68d9ba6006a165e65dec09487fb6e627088016c2'
             'f0a2f76266ba07275ab2baeab1497dfb2946305e85ae68e3b34dd14e2ac47423')
 
@@ -23,7 +42,7 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	python setup.py install --root "${pkgdir}"
-	install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-	install -D -m644 "${srcdir}/${pkgname}d.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}d.service"
+	python setup.py install --root "${pkgdir}" --optimize=1 --skip-build
+	install -Dm 644 "${srcdir}/alerta.sysusers" "${pkgdir}/usr/lib/sysusers.d/alerta.conf"
+	install -Dm 644 "${srcdir}/alertad.service" -t "${pkgdir}/usr/lib/systemd/system/"
 }