update to 3.5.20200106

2 files changed, 14 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca659090dcd1..746b424ff80b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nagstamon-beta
 	pkgdesc = Nagios status monitor for the desktop
-	pkgver = 3.3.0.20191114
+	pkgver = 3.5.0.20200106
 	pkgrel = 1
 	url = https://nagstamon.ifw-dresden.de/
 	arch = any
@@ -17,9 +17,9 @@ pkgbase = nagstamon-beta
 	depends = python-dbus
 	provides = nagstamon
 	conflicts = nagstamon
-	source = https://nagstamon.ifw-dresden.de/files/unstable/nagstamon-3.3.20191114.fedora31-1.src.rpm
-	md5sums = 792c4726f86faa132d9c4cc71e24b9c2
-	sha256sums = 33e2d807c5b5de4c26bbe2faa85df32e58ffa2b1d7b699266f43fde3c98a1c30
+	source = https://nagstamon.ifw-dresden.de/files/testing/Nagstamon-3.5-20200106.tar.gz
+	md5sums = a378468342fee7c4f10d4ccdfa8f963a
+	sha256sums = 2e98cf9c9b81b567abee31f8baeafb0d9ff28aa3dad7caf5fed9a0385685ab33
 
 pkgname = nagstamon-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 19a28cb6a4e7..72a93777b187 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: ghostbuster <aur@sieverdingbeck.com>
-_pkgname=nagstamon
-_pkgver='3.3.20191114'
+_pkgname=Nagstamon
+_pkgver='3.5-20200106'
 pkgname=nagstamon-beta
-pkgver='3.3.0.20191114'
+pkgver='3.5.0.20200106'
 pkgrel=1
 pkgdesc="Nagios status monitor for the desktop"
 depends=('python-pyqt5' 'qt5-multimedia' 'qt5-svg' 'python-requests' 'python-beautifulsoup4' 'python-keyring' 'python-psutil' 'python-requests-kerberos' 'python-lxml' 'python-dbus')
@@ -12,30 +12,27 @@ license=('GPL')
 conflicts=('nagstamon')
 provides=('nagstamon')
 source=(
-        "https://nagstamon.ifw-dresden.de/files/unstable/${_pkgname}-${_pkgver}.fedora31-1.src.rpm"
+        "https://nagstamon.ifw-dresden.de/files/testing/$_pkgname-$_pkgver.tar.gz"
 )
 md5sums=(
-        '792c4726f86faa132d9c4cc71e24b9c2'
+        'a378468342fee7c4f10d4ccdfa8f963a'
 )
 sha256sums=(
-        '33e2d807c5b5de4c26bbe2faa85df32e58ffa2b1d7b699266f43fde3c98a1c30'
+        '2e98cf9c9b81b567abee31f8baeafb0d9ff28aa3dad7caf5fed9a0385685ab33'
 )
 
-prepare() {
-  cd "$srcdir/"
-  tar -xzf "$_pkgname-$_pkgver.fedora31.tar.gz"
-}
-
 package() {
-  cd "${srcdir}/$_pkgname-$_pkgver.fedora31"
+  cd "$srcdir/$_pkgname"
   # setup.py imports AppInfo from Nagstamon.Config which leads to a import of keyring
   # importing keyring fails in a fakeroot environment, which seems to be somehow related to a the keyring connection init triggered by the import
   # to avoid the issue setup.py is rewritten here to resolve the need for the AppInfo import
   name=$(sed '0,/class AppInfo/d' Nagstamon/Config.py  | grep "NAME " | sed -e "s/^[\t ]*NAME = '//" -e "s/'$//")
   version=$(sed '0,/class AppInfo/d' Nagstamon/Config.py  | grep "VERSION " | sed -e "s/^[\t ]*VERSION = '//" -e "s/'$//")
   sed -i setup.py -e "s/from Nagstamon.Config import AppInfo//" -e "s/AppInfo.NAME/'${name}'/" -e "s/AppInfo.VERSION/'${version}'/"
-  sed -i setup.py -e "s/platform.dist()/('arch', '', '')/g"
   sed -i Nagstamon/setup.py -e "s/from Nagstamon.Config import AppInfo//" -e "s/AppInfo.NAME/'${name}'/" -e "s/AppInfo.VERSION/'${version}'/"
+  sed -i setup.py -e "s/from Nagstamon.Helpers import get_distro//"
+  sed -i setup.py -e "s/get_distro()/('arch', '', 'Arch Linux')/"
   python setup.py install --prefix=/usr --root="$pkgdir"
+  mv $pkgdir/usr/bin/nagstamon.py $pkgdir/usr/bin/nagstamon
 }