leo: update to 5.7.3

Additionally change the download url to github.
Quote all pkgdir and srcdir vars and remove install file, as this is covered by hooks

3 files changed, 20 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 295eb929a140..10354b7ba71c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Thu Dec 14 01:11:00 UTC 2017
 pkgbase = leo
 	pkgdesc = Literate programmer's editor, outliner, and project manager
-	pkgver = 5.6
+	pkgver = 5.7.3
 	pkgrel = 1
 	url = http://leoeditor.com/
-	install = leo.install
 	arch = any
 	license = custom
 	depends = python-pyqt5
@@ -15,10 +12,10 @@ pkgbase = leo
 	optdepends = python-pyenchant: spellchecking support
 	optdepends = python-docutils: viewrendered support
 	optdepends = python-sphinx: documentation support
-	source = http://downloads.sourceforge.net/sourceforge/leo/Leo-5.6.zip
+	source = leo-5.7.3.tar.gz::https://github.com/leo-editor/leo-editor/archive/5.7.3.tar.gz
 	source = leo.desktop
 	source = leo.xml
-	sha256sums = f1eb18bd30b229cfc3f8f38c07fb41e4619d19a6f9caef0714068e3c65045208
+	sha256sums = 4021a614f26b0a043818e67b97a24bffb54c90efca8709c045ddbaab3c4a5512
 	sha256sums = 7b326791378eefedecee2474c4e1a497838d2a06ff4259a195d817c38588395b
 	sha256sums = 630852279324b0d9acf656c4684f16777d64f49b4062bd101c5cddbfc33c82cb
 
diff --git a/PKGBUILD b/PKGBUILD
index 162bb4ff0550..f1614fd9ef1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
-# Maintainer: David Scholl <djscholl at gmail dot com>
+# Contributor: David Scholl <djscholl at gmail dot com>
+
 pkgname=leo
-pkgver=5.6
+pkgver=5.7.3
 pkgrel=1
 pkgdesc="Literate programmer's editor, outliner, and project manager"
 arch=('any')
@@ -11,21 +12,24 @@ depends=('python-pyqt5' 'shared-mime-info' 'desktop-file-utils'
 optdepends=('python-pyenchant: spellchecking support'
             'python-docutils: viewrendered support' 
             'python-sphinx: documentation support')
-
-install="leo.install"
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/Leo-$pkgver.zip
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/leo-editor/leo-editor/archive/${pkgver}.tar.gz
         leo.desktop
         leo.xml)
-sha256sums=('f1eb18bd30b229cfc3f8f38c07fb41e4619d19a6f9caef0714068e3c65045208'
+sha256sums=('4021a614f26b0a043818e67b97a24bffb54c90efca8709c045ddbaab3c4a5512'
             '7b326791378eefedecee2474c4e1a497838d2a06ff4259a195d817c38588395b'
             '630852279324b0d9acf656c4684f16777d64f49b4062bd101c5cddbfc33c82cb')
 
+build() {
+  cd "${pkgname}-${pkgver}"
+  python setup.py build
+}
+
 package() {
-  cd $srcdir/Leo-$pkgver
-  cp leo/dist/setup.py leo/dist/setup.cfg leo/dist/leo-install.py ./
-  python setup.py install --root=$pkgdir
-  install -D -m644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE.TXT
-  install -D -m644 $srcdir/leo.desktop $pkgdir/usr/share/applications/leo.desktop
-  install -D -m644 $srcdir/leo.xml $pkgdir/usr/share/mime/packages/leo.xml
-  install -D -m644 leo/Icons/application-x-leo-outline.png $pkgdir/usr/share/pixmaps/leo.png
+  cd "${pkgname}-${pkgver}"
+
+  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+  install -D -m644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE.TXT"
+  install -D -m644 "$srcdir/leo.desktop" "$pkgdir/usr/share/applications/leo.desktop"
+  install -D -m644 "$srcdir/leo.xml" "$pkgdir/usr/share/mime/packages/leo.xml"
+  install -D -m644 "leo/Icons/application-x-leo-outline.png" "$pkgdir/usr/share/pixmaps/leo.png"
 }
diff --git a/leo.install b/leo.install
deleted file mode 100644
index 4c6b01bdfdb2..000000000000
--- a/leo.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime >/dev/null
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-/bin/true
-}
-
-post_remove() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime >/dev/null
-}
-
-op=$1
-shift
-
-$op "$@"