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

[Stéphane Gaudreault]

    Date: Sunday, February 20, 2011 @ 20:06:01
  Author: stephane
Revision: 110650

rename 2to3 -> 2to3-2.7

Modified:
  python2/trunk/PKGBUILD

----------+
 PKGBUILD |   31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-02-20 21:41:26 UTC (rev 110649)
+++ PKGBUILD    2011-02-21 01:06:01 UTC (rev 110650)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=6
+pkgrel=7
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -48,36 +48,37 @@
 
 package() {
   cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR=${pkgdir} altinstall maninstall
+  make DESTDIR="${pkgdir}" altinstall maninstall
 
-  ln -sf python${_pybasever}        ${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1      ${pkgdir}/usr/share/man/man1/python2.1
+  ln -sf python${_pybasever}        "${pkgdir}/usr/bin/python2"
+  ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
+  ln -sf python${_pybasever}.1      "${pkgdir}/usr/share/man/man1/python2.1"
 
   ln -sf ../../libpython${_pybasever}.so \
-    ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+    "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
 
-  mv ${pkgdir}/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
+  mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
 
   # some useful "stuff"
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+  install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
   install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-    ${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
   install -m755 Tools/scripts/{README,*py} \
-    ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
 
   # fix conflicts with python
-  mv ${pkgdir}/usr/bin/idle{,2}
-  mv ${pkgdir}/usr/bin/pydoc{,2}
+  mv "${pkgdir}"/usr/bin/idle{,2}
+  mv "${pkgdir}"/usr/bin/pydoc{,2}
+  mv "${pkgdir}"/usr/bin/2to3{,-2.7}
 
   # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
+  find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
     xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
 
   # clean-up reference to build directory
   sed -i "s#${srcdir}/Python-${pkgver}:##" \
-    ${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
+    "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
 
   # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }