2.8.0

2 files changed, 38 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab2715f4de9c..64021d46c315 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = nut-monitor
 	pkgdesc = GUI to manage devices connected a NUT server
-	pkgver = 2.7.4
-	pkgrel = 3
+	pkgver = 2.8.0
+	pkgrel = 1
 	url = http://www.networkupstools.org/
 	arch = any
 	license = GPL3
 	makedepends = desktop-file-utils
-	depends = python2
-	depends = pygtk
-	source = http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz
-	sha256sums = 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7
+	depends = python
+	depends = python-pyqt5
+	depends = hicolor-icon-theme
+	source = http://www.networkupstools.org/source/2.8/nut-2.8.0.tar.gz
+	sha256sums = c3e5a708da797b7c70b653d37b1206a000fcb503b85519fe4cdf6353f792bfe5
 
 pkgname = nut-monitor
-
diff --git a/PKGBUILD b/PKGBUILD
index 0f19d866dd45..beef006de223 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,51 @@
 # Maintainer: Dan Ziemba <zman0900@gmail.com>
 
 pkgname=nut-monitor
-pkgver=2.7.4
-pkgrel=3
+pkgver=2.8.0
+pkgrel=1
 pkgdesc="GUI to manage devices connected a NUT server"
 arch=('any')
 url="http://www.networkupstools.org/"
 license=('GPL3')
-depends=('python2' 'pygtk')
+depends=('python' 'python-pyqt5' 'hicolor-icon-theme')
 makedepends=('desktop-file-utils')
-source=("http://www.networkupstools.org/source/2.7/nut-$pkgver.tar.gz")
-sha256sums=('980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7')
+source=("http://www.networkupstools.org/source/2.8/nut-$pkgver.tar.gz")
+sha256sums=('c3e5a708da797b7c70b653d37b1206a000fcb503b85519fe4cdf6353f792bfe5')
 
 prepare() {
   cd "$srcdir/nut-$pkgver"
-  
-  sed -i 's|=NUT-Monitor|=nut-monitor|'  scripts/python/app/nut-monitor.desktop
-  sed -i 's|=nut-monitor.png|=nut-monitor|' scripts/python/app/nut-monitor.desktop
-  sed -i 's|os.path.dirname( sys.argv\[0\] )|"/usr/share/nut-monitor"|' scripts/python/app/NUT-Monitor
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2.7|' scripts/python/app/NUT-Monitor
+
+  sed -i 's|os.path.dirname( sys.argv\[0\] )|"/usr/share/nut-monitor"|' scripts/python/app/NUT-Monitor-py3qt5.in
+}
+
+build() {
+  cd "$srcdir/nut-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --without-python2
 }
 
 package() {
   cd "$srcdir/nut-$pkgver"
 
-  install -D -m644 scripts/python/module/PyNUT.py $pkgdir/usr/lib/python2.7/site-packages/PyNUT.py
+  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  install -v -d -m 755 "${pkgdir}${site_packages}"
+  install -m644 scripts/python/module/PyNUT.py "${pkgdir}${site_packages}"
+
+  install -v -d -m 755 ${pkgdir}/usr/{bin,share/{appdata,nut-monitor/{pixmaps,ui,icons/256x256}}}
+  install -m 755 scripts/python/app/NUT-Monitor-py3qt5 ${pkgdir}/usr/bin
+  install -m 644 scripts/python/app/nut-monitor.appdata.xml ${pkgdir}/usr/share/appdata
+  install -m 644 scripts/python/app/pixmaps/* ${pkgdir}/usr/share/nut-monitor/pixmaps
+  install -m 644 scripts/python/app/ui/* ${pkgdir}/usr/share/nut-monitor/ui
+  install -m 644 scripts/python/app/icons/256x256/nut-monitor.png ${pkgdir}/usr/share/nut-monitor/icons/256x256
 
-  install -D -m 755 scripts/python/app/NUT-Monitor $pkgdir/usr/bin/nut-monitor
-  install -D -m 644 scripts/python/app/nut-monitor.png $pkgdir/usr/share/pixmaps/nut-monitor.png
-  install -D -m 644 scripts/python/app/nut-monitor.appdata.xml $pkgdir/usr/share/appdata/nut-monitor.appdata.xml
+  for size in {48x48,64x64,256x256,scalable}; do
+    install -v -d -m 755 ${pkgdir}/usr/share/icons/hicolor/${size}/apps
+    install -m 644 scripts/python/app/icons/${size}/* ${pkgdir}/usr/share/icons/hicolor/${size}/apps
+  done
 
-  install -d -m 755 $pkgdir/usr/share/nut-monitor/pixmaps
-  install -m 644 scripts/python/app/gui-1.3.glade $pkgdir/usr/share/nut-monitor/
-  install -m 644 scripts/python/app/pixmaps/* $pkgdir/usr/share/nut-monitor/pixmaps/ 
+  desktop-file-install --dir=$pkgdir/usr/share/applications scripts/python/app/nut-monitor-py3qt5.desktop
 
-  desktop-file-install --dir=$pkgdir/usr/share/applications scripts/python/app/nut-monitor.desktop
+  ln -s NUT-Monitor-py3qt5 ${pkgdir}/usr/bin/nut-monitor
 }