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

[Eli Schwartz]

    Date: Tuesday, January 23, 2018 @ 11:56:17
  Author: eschwartz
Revision: 285536

upgpkg: python-babel 2.5.3-4

Fix FS#57186
Turns out locale-data was being excluded due to improperly-ordered
build steps causing setup.py build to not see .dat files.

Modified:
  python-babel/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-23 11:52:13 UTC (rev 285535)
+++ PKGBUILD	2018-01-23 11:56:17 UTC (rev 285536)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Morten Linderud <foxboron at archlinux.no> 
+# Maintainer: Morten Linderud <foxboron at archlinux.no>
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor : Giedrius Slavinskas <giedrius25 at gmail.com>
 
@@ -6,17 +6,17 @@
 pkgbase=python-babel
 pkgname=(python-babel python2-babel)
 pkgver=2.5.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of tools for internationalizing Python applications"
 url="http://babel.pocoo.org/"
 license=("BSD")
 arch=('any')
 makedepends=('python' 'python2'
-	    'python-setuptools' 'python2-setuptools'
-	    'python-pytz' 'python2-pytz')
+             'python-setuptools' 'python2-setuptools'
+             'python-pytz' 'python2-pytz')
 noextract=("core-28.zip")
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/python-babel/babel/archive/v$pkgver.tar.gz"
-	"core-29.zip::http://unicode.org/Public/cldr/29/core.zip")
+        "core-29.zip::http://unicode.org/Public/cldr/29/core.zip")
 sha256sums=('4c231f28875552abe18c6c10829cec0884d7eeb27423b562357250dc32090cb9'
             'b3308f8d3b4a80045ce4262b2784ac8d99775e80aaacafbf1277833f6b28ffda')
 
@@ -28,12 +28,12 @@
 
 build(){
   cd "$srcdir/babel-$pkgver"
+  python setup.py import_cldr
   python setup.py build
-  python setup.py import_cldr
 
   cd "$srcdir/babel-$pkgver-py2"
+  python2 setup.py import_cldr
   python2 setup.py build
-  python2 setup.py import_cldr
 }
 
 package_python-babel() {
@@ -41,7 +41,6 @@
 
   cd "$srcdir"/babel-${pkgver}
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  mv babel/locale-data "$pkgdir"/usr/lib/python3.6/site-packages/babel/
   install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
@@ -50,7 +49,6 @@
 
   cd "$srcdir"/babel-${pkgver}-py2
   python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  mv babel/locale-data "$pkgdir"/usr/lib/python2.7/site-packages/babel/
   mv "$pkgdir"/usr/bin/pybabel "$pkgdir"/usr/bin/pybabel2
   install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }