upgpkg: python-usfm2osis-cw-git r139.a861a53-2

2 files changed, 25 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90c33644bcdb..0a4afccf7ed8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,15 @@
 pkgbase = python-usfm2osis-cw-git
 	pkgdesc = Tools for converting Bibles from USFM to OSIS XML (CrossWire Development Fork)
 	pkgver = r139.a861a53
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/JohnAustinDev/Module-tools/
 	arch = any
-	license = GPLv3
+	license = GPL
 	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python
 	provides = python-usfm2osis
 	conflicts = python-usfm2osis
@@ -15,4 +18,3 @@ pkgbase = python-usfm2osis-cw-git
 	sha256sums = SKIP
 
 pkgname = python-usfm2osis-cw-git
-
diff --git a/PKGBUILD b/PKGBUILD
index ae7ab1452ed3..1325c5a04e53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,17 @@
 pkgname=python-usfm2osis-cw-git
 _pypiname=usfm2osis
 pkgver=r139.a861a53
-pkgrel=1
+pkgrel=2
 _branch=module-tools-sync
-pkgdesc="Tools for converting Bibles from USFM to OSIS XML (CrossWire Development Fork)"
-arch=('any')
-url="https://github.com/JohnAustinDev/Module-tools/"
-license=('GPLv3')
-makedepends=('git' 'python-setuptools')
-depends=('python')
+pkgdesc='Tools for converting Bibles from USFM to OSIS XML (CrossWire Development Fork)'
+arch=(any)
+url=https://github.com/JohnAustinDev/Module-tools/
+license=(GPL)
+depends=(python)
+makedepends=(git
+             python-{build,installer}
+             python-setuptools
+             python-wheel)
 options=(!emptydirs)
 provides=("${pkgname%-cw-git}")
 conflicts=("${pkgname%-cw-git}")
@@ -18,22 +21,20 @@ source=("git://github.com/alerque/$_pypiname.git#branch=$_branch")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pypiname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "$_pypiname"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "$srcdir/$_pypiname"
-  mv usfm2osis/scripts/*py usfm2osis/
-  sed -i -e 's/usfm2osis.scripts/usfm2osis/g' setup.py
-  sed -i -e '/__main__/s/^.*$/def main(args=None):/g' usfm2osis/usfm2osis.py
-  sed -i -e '/^scriptVersion/a DEBUG = False' usfm2osis/usfm2osis.py
-  python setup.py build
+	cd "$_pypiname"
+	mv usfm2osis/scripts/*py usfm2osis/
+	sed -i -e 's/usfm2osis.scripts/usfm2osis/g' setup.py
+	sed -i -e '/__main__/s/^.*$/def main(args=None):/g' usfm2osis/usfm2osis.py
+	sed -i -e '/^scriptVersion/a DEBUG = False' usfm2osis/usfm2osis.py
+	python -m build
 }
 
 package() {
-  cd "$srcdir/$_pypiname"
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	cd "$_pypiname"
+	python -m installer -d "$pkgdir" dist/*.whl
 }
-
-# vim:set ts=2 sw=2 et: