update to 6.7.1

1 files changed, 22 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9d0c3a48ba2a..ad875425766e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: David Scholl <djscholl at gmail dot com>
 
 pkgname=leo
-pkgver=6.6.4
+pkgver=6.7.1
 pkgrel=1
 pkgdesc="Outliner, Editor, and Personal Information Manager"
 arch=('any')
@@ -25,25 +25,32 @@ depends=(
 	'python-pyshortcuts'
 	'python-sphinx'
 	'shared-mime-info')
-makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+makedepends=(
+	'dos2unix'
+	'python-build'
+	'python-installer'
+	'python-setuptools'
+	'python-wheel')
 optdepends=('python-pyenchant: spellchecking support')
 # checkdepends=('python-pytest')
 provides=('leo-editor')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/l/leo/leo-${pkgver/_/-}.tar.gz"
+        'remove-tests.patch'
         'leo.desktop'
         'leo.xml')
-sha256sums=('abda5fef1ab9af22e9f77f0afc39ceb27c99eb338b925a8b31a03a848020349f'
+sha256sums=('e5671503a1d0d62a9a00a01470b2b23a6f3cb0d35808cc499509f15dd91e066f'
+            'cc351848ffa6ce740c8cbb74f60363b6f4b3f3fccd90a09512e76900006f37fa'
             '4633876eb91eff206660359ee7da459211e8f87fd73ebbc680fd437c70b63467'
             '630852279324b0d9acf656c4684f16777d64f49b4062bd101c5cddbfc33c82cb')
 
 prepare() {
-	cd "$pkgname-editor-$pkgver"
-	sed -i -e '/setupext-janitor/d' -e '/wheel/s/,/]/' -e '/twine/d' pyproject.toml
-	# sed -i '/packages=/s/()/(exclude=["leo.test.*", "leo.unittests.*"])/' setup.py
+	cd "$pkgname-$pkgver"
+	dos2unix setup.py
+	patch -p1 -l < "$srcdir/remove-tests.patch"
 }
 
 build() {
-	cd "$pkgname-editor-$pkgver"
+	cd "$pkgname-$pkgver"
 	python -m build --wheel --no-isolation
 }
 
@@ -54,12 +61,12 @@ build() {
 # }
 
 package() {
-	cd "$pkgname-editor-$pkgver"
-	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir/" dist/*.whl
-	install -Dm644 "$srcdir/leo.desktop" -t "$pkgdir/usr/share/applications/"
-	install -Dm644 "$srcdir/leo.xml" -t "$pkgdir/usr/share/mime/packages/"
-	install -Dm644 "leo/Icons/application-x-leo-outline.png" "$pkgdir/usr/share/pixmaps/leo.png"
+	cd "$pkgname-$pkgver"
+	python -m installer --destdir="$pkgdir/" dist/*.whl
+	install -Dvm644 "$srcdir/leo.desktop" -t "$pkgdir/usr/share/applications/"
+	install -Dvm644 "$srcdir/leo.xml" -t "$pkgdir/usr/share/mime/packages/"
+	install -Dvm644 "leo/Icons/application-x-leo-outline.png" "$pkgdir/usr/share/pixmaps/leo.png"
 	local _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
-	install -d "$pkgdir/usr/share/licenses/$pkgname/"
-	ln -s "$_site/leo-$pkgver.dist-info/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/"
+	install -dv "$pkgdir/usr/share/licenses/$pkgname/"
+	ln -sv "$_site/leo-${pkgver%_*}.dist-info/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/"
 }