[arch-commits] Commit in python-qrcode/trunk (PKGBUILD)

[Levente Polyak]

    Date: Tuesday, January 15, 2019 @ 00:08:13
  Author: anthraxx
Revision: 423108

upgpkg: python-qrcode 6.1-1

Modified:
  python-qrcode/trunk/PKGBUILD

----------+
 PKGBUILD |   53 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-14 23:53:18 UTC (rev 423107)
+++ PKGBUILD	2019-01-15 00:08:13 UTC (rev 423108)
@@ -1,35 +1,40 @@
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
 # Contributor: Francois Boulogne <fboulogne at april dot org>
 
 pkgbase=python-qrcode
 pkgname=(python-qrcode python2-qrcode)
-pkgver=6.0
-pkgrel=2
-pkgdesc="Python library to generate QR codes"
+pkgver=6.1
+pkgrel=1
+pkgdesc='Python library to generate QR codes'
+url='https://github.com/lincolnloop/python-qrcode'
 arch=('any')
-url="https://github.com/lincolnloop/python-qrcode"
 license=('custom')
 makedepends=('python-pillow' 'python2-pillow' 'python-six' 'python2-six' 'python-setuptools' 'python2-setuptools')
 checkdepends=('python2-mock')
-source=(https://pypi.io/packages/source/q/qrcode/qrcode-${pkgver}.tar.gz
-        https://github.com/lincolnloop/python-qrcode/commit/35056062270a3d5084b1217df611d09cd94c5ca3.patch)
-sha512sums=('c43f12fe6b12d244d19a994cfd20adbe3776bbda1459c9dbc6164b1c9e7637f05e2acc1c2d29b82243024a4ea9b46c319a56acdf6d05e7b697bcd2c31c02102e'
-            '320ec020268d8ede2f80ba622cd593b2ba9758f1d264fdb546dac126a841d454d02d12ae57edc6601bfd19062953bce9189b59184ce653d43c002e7664f87018')
+source=(https://github.com/lincolnloop/python-qrcode/archive/v${pkgver}/${pkgbase}-v${pkgver}.tar.gz)
+sha512sums=('3af3b67959be8dd30b372145ff7b8aa1e20153c403b17c688d5a7189e3b25da872c6eee916e6d47e4f6545c87c0c0eb9af52e115353a0e8c0f73e4948ddc6829')
 
 prepare() {
-  (cd qrcode-$pkgver; patch -p1 -i ../35056062270a3d5084b1217df611d09cd94c5ca3.patch)
-  cp -a qrcode-$pkgver{,-py2}
-
-  find "qrcode-$pkgver-py2" -type f -exec sed -e 's#/usr/bin/python#/usr/bin/python2#g' \
+  cp -a ${pkgbase}-${pkgver}{,-py2}
+  find "${pkgbase}-${pkgver}-py2" -type f -exec sed -e 's#/usr/bin/python#/usr/bin/python2#g' \
                                               -e 's#/usr/bin/env python#/usr/bin/env python2#g' -i {} +
 }
 
+build() {
+  cd "${srcdir}"/${pkgbase}-${pkgver}
+  python setup.py build
+
+  cd "${srcdir}"/${pkgbase}-${pkgver}-py2
+  python2 setup.py build
+}
+
 check() {
-  cd "$srcdir"/qrcode-$pkgver
+  cd "${srcdir}"/${pkgbase}-${pkgver}
   python -m unittest discover qrcode
 
-  cd "$srcdir"/qrcode-$pkgver-py2
+  cd "${srcdir}"/${pkgbase}-${pkgver}-py2
   python2 -m unittest discover qrcode
 }
 
@@ -36,22 +41,20 @@
 package_python-qrcode() {
   depends=('python-pillow' 'python-six' 'python-setuptools')
 
-  cd "qrcode-$pkgver"
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  cd ${pkgbase}-${pkgver}
+  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
 }
 
 package_python2-qrcode() {
   depends=('python2-pillow' 'python2-six' 'python2-setuptools')
 
-  cd "qrcode-$pkgver-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
+  cd ${pkgbase}-${pkgver}-py2
+  python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
 
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-  mv "$pkgdir"/usr/bin/qr{,2}
-  mv "$pkgdir"/usr/share/man/man1/qr{,2}.1
+  rm -r "${pkgdir}"/usr/bin
+  rm -r "${pkgdir}"/usr/share/man
 }
 
 # vim:ts=2:sw=2:et: