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

[Felix Yan]

    Date: Wednesday, April 26, 2017 @ 08:10:21
  Author: felixonmars
Revision: 225457

upgpkg: python-oslo-config 4.0.0-1

Modified:
  python-oslo-config/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-26 08:09:53 UTC (rev 225456)
+++ PKGBUILD	2017-04-26 08:10:21 UTC (rev 225457)
@@ -4,40 +4,42 @@
 
 pkgbase=python-oslo-config
 pkgname=(python-oslo-config python2-oslo-config)
-pkgver=3.24.0
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="parsing command line arguments and .ini style configuration files"
 arch=('any')
 url="https://pypi.python.org/pypi/oslo.config/$pkgver"
 license=('Apache')
-makedepends=('git' 'python-setuptools' 'python2-setuptools' 'python-netaddr' 'python2-netaddr'
+makedepends=('python-setuptools' 'python2-setuptools' 'python-netaddr' 'python2-netaddr'
              'python-stevedore' 'python2-stevedore' 'python-debtcollector' 'python2-debtcollector'
              'python-oslo-i18n' 'python2-oslo-i18n' 'python-rfc3986' 'python2-rfc3986')
 checkdepends=('python-oslotest' 'python2-oslotest' 'python-sphinx' 'python2-sphinx')
 options=('!emptydirs')
-source=("git+https://git.openstack.org/openstack/oslo.config#tag=$pkgver")
-sha512sums=('SKIP')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/oslo.config/archive/$pkgver.tar.gz")
+sha512sums=('47e717a469c8d3ef8c7c27a5ac769c6b04dc322233570c27b956c5bf662286fdfbaeaf73a9dd631419ac19855028250c2ccfd3d9a05474ca2d61a61ee55b5ef7')
 
 prepare() {
-  sed -i '/argparse/d' oslo.config/requirements.txt
+  sed -i '/argparse/d' oslo.config-$pkgver/requirements.txt
 
-  cp -a oslo.config{,-py2}
-  find oslo.config-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
+  cp -a oslo.config-$pkgver{,-py2}
+  find oslo.config-$pkgver-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
+
+  export PBR_VERSION=$pkgver
 }
 
 build() {
-  cd "$srcdir"/oslo.config
+  cd "$srcdir"/oslo.config-$pkgver
   python setup.py build
 
-  cd "$srcdir"/oslo.config-py2
+  cd "$srcdir"/oslo.config-$pkgver-py2
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir"/oslo.config
+  cd "$srcdir"/oslo.config-$pkgver
   python setup.py testr
 
-  cd "$srcdir"/oslo.config-py2
+  cd "$srcdir"/oslo.config-$pkgver-py2
   PYTHON=python2 python2 setup.py testr
 }
 
@@ -45,7 +47,7 @@
   depends=('python-six' 'python-netaddr' 'python-stevedore' 'python-debtcollector'
            'python-oslo-i18n' 'python-rfc3986')
 
-  cd "$srcdir"/oslo.config
+  cd "$srcdir"/oslo.config-$pkgver
   python setup.py install --root="$pkgdir/" --optimize=1
 }
 
@@ -53,9 +55,9 @@
   depends=('python2-six' 'python2-netaddr' 'python2-stevedore' 'python2-debtcollector'
            'python2-oslo-i18n' 'python2-rfc3986')
 
-  cd "$srcdir"/oslo.config-py2
+  cd "$srcdir"/oslo.config-$pkgver-py2
   python2 setup.py install --root="$pkgdir/" --optimize=1
-  mv $pkgdir/usr/bin/oslo-config-generator $pkgdir/usr/bin/oslo-config-generator2
+  mv "$pkgdir"/usr/bin/oslo-config-generator{,2}
 }
 
 # vim:set ts=2 sw=2 et: