upstream removed Nagstamon/setup.py, minor adjustments

1 files changed, 4 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f7bf665bebe4..905767e0a41c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Vyacheslav Artemiev <artemiev.vyacheslav a gmail d com>
 _pkgname=nagstamon
 pkgname=$_pkgname-git
-pkgver=3.9.20211208.r2329.16549c68
-pkgrel=2
+pkgver=3.9.20220516.r2399.ccb16316
+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' 'python-dateutil' 'python-pysocks')
 optdepends=('python-requests-gssapi: Will be used instead of python-requests-kerberos for kerberos auth if present')
@@ -30,12 +30,11 @@ pkgver() {
 package() {
   cd "$srcdir/repo"
   # 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
+  # importing keyring fails in a fakeroot environment, which seems to be somehow related to a 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 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.Config import AppInfo.*//" -e "s/AppInfo.NAME/'${name}'/" -e "s/AppInfo.VERSION/'${version}'/" -e "s/  *OS$/OS = 'Linux'/"
   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"