New upstream, updated dependencies, new version v20.11

2 files changed, 23 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c365c39dd7e0..1d3f0e7bb805 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,27 @@
 pkgbase = hdtv
 	pkgdesc = Nuclear spectrum analysis tool on top of the ROOT data analysis toolkit
-	pkgver = 18.04
-	pkgrel = 2
-	url = https://gitlab.ikp.uni-koeln.de/staging/hdtv
+	pkgver = 20.11
+	pkgrel = 1
+	url = https://github.com/janmayer/hdtv
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = libx11
 	makedepends = python-docutils
 	depends = glibc
+	depends = libx11
 	depends = python
-	depends = root
-	depends = libmfile
+	depends = root>=6.22.06
+	depends = python-matplotlib
+	depends = python-prompt_toolkit
 	depends = python-setuptools
 	depends = python-scipy
-	depends = python-matplotlib
+	depends = python-traitlets
 	depends = python-uncertainties
 	provides = hdtv
 	conflicts = hdtv
 	options = !emptydirs
-	source = hdtv-v18.04.tar.gz::https://gitlab.ikp.uni-koeln.de/staging/hdtv/repository/v18.04/archive.tar.gz
-	sha256sums = 1352ef93037e40cc33ec02fd64031f314a3e3eae97fe48457d51300a1e0f4f42
+	source = https://github.com/janmayer/hdtv/archive/v20.11.tar.gz
+	sha256sums = 8fa50549285f5e64b6ee63ce677c81b99e81a0eb56d555ef3d230fe661cc0866
 
 pkgname = hdtv
 
diff --git a/PKGBUILD b/PKGBUILD
index be7e6533a57a..6e35aef86324 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,36 @@
 # Maintainer: Oliver Papst <opapst at ikp dot tu-darmstadt dot de>
 pkgname=hdtv
-_commit=f35e63437302548ba6e4a0845a6663f5741358dc
-pkgver=18.04
-pkgrel=2
+pkgver=20.11
+pkgrel=1
 pkgdesc="Nuclear spectrum analysis tool on top of the ROOT data analysis toolkit"
 arch=('i686' 'x86_64')
-url="https://gitlab.ikp.uni-koeln.de/staging/hdtv"
+url="https://github.com/janmayer/${pkgname}"
 license=('GPL')
 conflicts=('hdtv')
 provides=('hdtv')
 depends=('glibc'
+         'libx11'
          'python'
-         'root'
-         'libmfile'
+         'root>=6.22.06'
+         'python-matplotlib'
+         'python-prompt_toolkit'
          'python-setuptools'
          'python-scipy'
-         'python-matplotlib'
+         'python-traitlets'
          'python-uncertainties')
-makedepends=('libx11' 'python-docutils')
+makedepends=('python-docutils')
 #checkdepends=('python-pytest')
 options=(!emptydirs)
-source=("${pkgname}-v${pkgver}.tar.gz::https://gitlab.ikp.uni-koeln.de/staging/${pkgname}/repository/v${pkgver}/archive.tar.gz")
-sha256sums=('1352ef93037e40cc33ec02fd64031f314a3e3eae97fe48457d51300a1e0f4f42')
+source=("${url}/archive/v${pkgver}.tar.gz")
+sha256sums=('8fa50549285f5e64b6ee63ce677c81b99e81a0eb56d555ef3d230fe661cc0866')
 
 build() {
-    cd "${srcdir}/${pkgname}-v${pkgver}-${_commit}/doc/guide"
+    cd "${srcdir}/${pkgname}-${pkgver}/doc/guide"
     make || return 1
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-v${pkgver}-${_commit}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     python setup.py install --root="${pkgdir}/" --optimize=1
     install -Dm 0644 license.md "${pkgdir}/usr/share/licenses/${pkgname}/license.md"
 }