update by lilac

2 files changed, 37 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aea9d414aefc..b2c4bc6d77ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = python-openslide
-	pkgdesc = A simple interface to read whole-slide images in Python
+	pkgdesc = Python bindings to OpenSlide
 	pkgver = 1.1.1
-	pkgrel = 2
-	url = https://openslide.org
+	pkgrel = 3
+	url = https://github.com/openslide/openslide-python
 	arch = x86_64
 	license = LGPL
+	checkdepends = python-pytest
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://github.com/openslide/openslide-python/releases/download/v1.1.1/openslide-python-1.1.1.tar.xz
-	sha256sums = e3c1f27e4704221327d3c74b0960742079b18fea2d1896eda71a3efdd3f9d3f7
-
-pkgname = python-openslide
 	depends = openslide
 	depends = python-pillow
+	source = openslide-python-1.1.1.tar.gz::https://github.com/openslide/openslide-python/archive/v1.1.1.tar.gz
+	source = 0001-fix-setup-script.patch::https://github.com/openslide/openslide-python/commit/298b5a9a163eb2a371d90770b71706cc4cb0003a.patch
+	sha256sums = 33c390fe43e3d7d443fafdd66969392d3e9efd2ecd5d4af73c3dbac374485ed5
+	sha256sums = a84489927980ebb0d64d4a4ea146a4c709d6b77848e6e145869bf6f12d875c9c
 
-pkgname = python2-openslide
-	depends = openslide
-	depends = python2-pillow
+pkgname = python-openslide
 
diff --git a/PKGBUILD b/PKGBUILD
index dcc65f4835a7..616fdb84e6b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,44 @@
-# Maintainer: pingplug < aur at pingplug dot me >
+# Maintainer: Butui Hu <hot123tea123@gmail.com>
+# Contributor: pingplug < aur at pingplug dot me >
 
-pkgbase=python-openslide
-pkgname=('python-openslide' 'python2-openslide')
+_pkgname=openslide-python
+pkgname=python-openslide
 pkgver=1.1.1
-pkgrel=2
-pkgdesc="A simple interface to read whole-slide images in Python"
+pkgrel=3
+pkgdesc='Python bindings to OpenSlide'
 arch=('x86_64')
-url="https://openslide.org"
+url='https://github.com/openslide/openslide-python'
 license=('LGPL')
-makedepends=('python-setuptools'
-             'python2-setuptools')
-source=("https://github.com/openslide/openslide-python/releases/download/v${pkgver}/openslide-python-${pkgver}.tar.xz")
-sha256sums=('e3c1f27e4704221327d3c74b0960742079b18fea2d1896eda71a3efdd3f9d3f7')
+makedepends=(python-setuptools)
+checkdepends=(python-pytest)
+depends=(
+  openslide
+  python-pillow
+)
+source=(
+  "${_pkgname}-${pkgver}.tar.gz::https://github.com/openslide/openslide-python/archive/v${pkgver}.tar.gz"
+  "0001-fix-setup-script.patch::https://github.com/openslide/openslide-python/commit/298b5a9a163eb2a371d90770b71706cc4cb0003a.patch"
+)
+sha256sums=('33c390fe43e3d7d443fafdd66969392d3e9efd2ecd5d4af73c3dbac374485ed5'
+            'a84489927980ebb0d64d4a4ea146a4c709d6b77848e6e145869bf6f12d875c9c')
 
 prepare() {
-  cd "${srcdir}"
-  cp -a "openslide-python-${pkgver}"{,-py2}
+  cd "${_pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/0001-fix-setup-script.patch"
 }
 
 build() {
-  cd "${srcdir}/openslide-python-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   python setup.py build
-
-  cd "${srcdir}/openslide-python-${pkgver}-py2"
-  python2 setup.py build
 }
 
-package_python-openslide() {
-  depends=('openslide'
-           'python-pillow')
-
-  cd "${srcdir}/openslide-python-${pkgver}"
-  python setup.py install \
-    --root="${pkgdir}" \
-    --optimize=1
+check() {
+  cd "${_pkgname}-${pkgver}"
+  pytest -v
 }
 
-package_python2-openslide() {
-  depends=('openslide'
-           'python2-pillow')
-
-  cd "${srcdir}/openslide-python-${pkgver}-py2"
-  python2 setup.py install \
-    --root="${pkgdir}" \
-    --optimize=1
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }
-
 # vim:set ts=2 sw=2 et: