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

[Felix Yan]

    Date: Monday, April 4, 2016 @ 15:12:12
  Author: fyan
Revision: 263859

upgpkg: twisted 16.1.0-1

Modified:
  twisted/trunk/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-04 12:04:57 UTC (rev 263858)
+++ PKGBUILD	2016-04-04 13:12:12 UTC (rev 263859)
@@ -6,7 +6,7 @@
 
 pkgbase=twisted
 pkgname=(python-twisted python2-twisted)
-pkgver=16.0.0
+pkgver=16.1.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python"
 arch=('i686' 'x86_64')
@@ -21,9 +21,9 @@
 sha1sums=('SKIP')
 
 prepare() {
-  cp -a "twisted"{,-py2}
+  cp -a twisted{,-py2}
 
-  cd "twisted-py2"
+  cd twisted-py2
   sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
     twisted/python/test/pullpipe.py \
     twisted/mail/test/pop3testserver.py \
@@ -31,18 +31,18 @@
 }
 
 build() {
-  cd "$srcdir/twisted"
-  python3 setup.py build
+  cd "$srcdir"/twisted
+  python setup.py build
 
-  cd "$srcdir/twisted-py2"
+  cd "$srcdir"/twisted-py2
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/twisted"
+  cd "$srcdir"/twisted
   LC_CTYPE=en_US.utf8 xvfb-run python admin/run-python3-tests || warning "Tests failed"
 
-  cd "$srcdir/twisted-py2"
+  cd "$srcdir"/twisted-py2
   LC_CTYPE=en_US.utf8 xvfb-run python2 bin/trial twisted || warning "Tests failed"
 }
 
@@ -53,20 +53,16 @@
               'python-pyasn1: for using conch'
               'tk: for using tkconch')
 
-  cd "twisted"
-  python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+  cd twisted
+  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 
-  # Wrong path, wrong!
-  cp -a "$pkgdir"/usr/twisted/* "$pkgdir"/usr/lib/python3.5/site-packages/twisted/
-  rm -r "$pkgdir"/usr/twisted
-
   # twisted in python 3 supports only few command line tools for now.
   # Let's rename the tools the other way round after the python 3 version supports all.
   for name in trial twistd; do
-    mv "$pkgdir/usr/bin/$name"{,3}
+    mv "$pkgdir"/usr/bin/${name}{,3}
   done
 
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
 package_python2-twisted() {
@@ -81,7 +77,7 @@
   conflicts=('twisted<14.0.0')
   replaces=('twisted<14.0.0')
 
-  cd "twisted-py2"
+  cd twisted-py2
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }