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

[Felix Yan]

    Date: Friday, January 22, 2016 @ 09:20:12
  Author: fyan
Revision: 158539

upgpkg: python-oslo-config 3.3.0-1

Modified:
  python-oslo-config/trunk/PKGBUILD

----------+
 PKGBUILD |   39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-01-22 08:09:52 UTC (rev 158538)
+++ PKGBUILD    2016-01-22 08:20:12 UTC (rev 158539)
@@ -1,39 +1,46 @@
 # $Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Maintainer: Felix Yan <felixonm...@archlinux.org.
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+
 pkgbase=python-oslo-config
 pkgname=(python-oslo-config python2-oslo-config)
-_pythonname=oslo.config
-pkgver=3.1.0
+_pypiname=oslo.config
+pkgver=3.3.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=('GPL')
-makedepends=('python2-setuptools' python-setuptools)
-options=(!emptydirs)
-source=("https://pypi.python.org/packages/source/o/$_pythonname/$_pythonname-$pkgver.tar.gz";)
-md5sums=('2fdc066be79e0d5c4193bbf1ed90e5f5')
+makedepends=('python-setuptools' 'python2-setuptools')
+options=('!emptydirs')
+source=("https://pypi.python.org/packages/source/o/$_pypiname/$_pypiname-$pkgver.tar.gz";)
+md5sums=('e54771cb1b7690fcd30ad41eebf43c26')
 
 prepare(){
-  cp -a $_pythonname-$pkgver{,-2}
-  find $_pythonname-$pkgver-2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
-  sed -i '/argparse/d' "$_pythonname-$pkgver"{,-2}/requirements.txt
+  cp -a $_pypiname-$pkgver{,-py2}
+  find $_pypiname-$pkgver-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
+  sed -i '/argparse/d' "$_pypiname-$pkgver"{,-py2}/requirements.txt
 }
 
 build(){
-  cd "$srcdir/$_pythonname-$pkgver"
+  cd "$srcdir/$_pypiname-$pkgver"
   python setup.py build
-  cd "$srcdir/$_pythonname-$pkgver-2"
+
+  cd "$srcdir/$_pypiname-$pkgver-py2"
   python2 setup.py build
 }
+
 package_python-oslo-config() {
-  cd "$srcdir/$_pythonname-$pkgver"
-  depends=(python)
+  depends=('python')
+
+  cd "$srcdir/$_pypiname-$pkgver"
   python setup.py install --root="$pkgdir/" --optimize=1
 }
+
 package_python2-oslo-config() {
-  cd "$srcdir/$_pythonname-$pkgver"
-  depends=(python2)
+  depends=('python2')
+
+  cd "$srcdir/$_pypiname-$pkgver-py2"
   python2 setup.py install --root="$pkgdir/" --optimize=1
   mv $pkgdir/usr/bin/oslo-config-generator 
$pkgdir/usr/bin/oslo-config-generator2
 }