[arch-commits] Commit in bash-completion/trunk (PKGBUILD python.patch)

[Eric Bélanger]

    Date: Monday, February 7, 2011 @ 02:27:13
  Author: eric
Revision: 109165

upgpkg: bash-completion 1.3-1
Upstream update

Modified:
  bash-completion/trunk/PKGBUILD
Deleted:
  bash-completion/trunk/python.patch

--------------+
 PKGBUILD     |   20 +++++++++---------
 python.patch |   62 ---------------------------------------------------------
 2 files changed, 10 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-06 21:21:00 UTC (rev 109164)
+++ PKGBUILD	2011-02-07 07:27:13 UTC (rev 109165)
@@ -1,29 +1,29 @@
 # $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=bash-completion
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=1
 pkgdesc="Programmable completion for the bash shell"
 arch=('any')
 url="http://bash-completion.alioth.debian.org/"
 license=('GPL')
 depends=('bash')
-source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.bz2 python.patch)
-md5sums=('88c022a98a02a02293716f840eadd884' '4657ba3d32f6f38765327fc640e5113d')
-sha1sums=('47e6fb919ae227e74172870379b0fe999a2ae70d' 'b6acd3317558615bf2949694f9c4d17e95eb0d07')
+source=(http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a1262659b4bbf44dc9e59d034de505ec')
+sha1sums=('6a46b93f44c56cc336632ab28d90c0595fbcc98f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 < ../python.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
 # Doesn't work on Arch Linux and cause problems (FS#20112)
-  rm "$pkgdir/etc/bash_completion.d/service"
+  rm "${pkgdir}/etc/bash_completion.d/service"
 }

Deleted: python.patch
===================================================================
--- python.patch	2011-02-06 21:21:00 UTC (rev 109164)
+++ python.patch	2011-02-07 07:27:13 UTC (rev 109165)
@@ -1,62 +0,0 @@
---- contrib/python.orig	2010-06-13 06:21:19.000000000 -0400
-+++ contrib/python	2011-01-28 23:16:27.000000000 -0500
-@@ -9,22 +9,22 @@
-     _get_comp_words_by_ref cur prev
- 
-     case $prev in
--    -Q)
--        COMPREPLY=( $( compgen -W "old new warn warnall" -- "$cur" ) )
--        return 0
--        ;;
--    -W)
--        COMPREPLY=( $( compgen -W "ignore default all module once error" \
--            -- "$cur" ) )
--        return 0
--        ;;
--    -c)
--        _filedir '@(py|pyc|pyo)'
--        return 0
--        ;;
--    !(python|-?))
--        [[ ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] && _filedir
--        ;;
-+        -'?'|-h|--help|-V|--version|-c|-m)
-+            return 0
-+            ;;
-+        -Q)
-+            COMPREPLY=( $( compgen -W "old new warn warnall" -- "$cur" ) )
-+            return 0
-+            ;;
-+        -W)
-+            COMPREPLY=( $( compgen -W "ignore default all module once error" \
-+                -- "$cur" ) )
-+            return 0
-+            ;;
-+        !(?(*/)python*([0-9.])|-?))
-+            [[ $COMP_CWORD -lt 2 || ${COMP_WORDS[COMP_CWORD-2]} != -@(Q|W) ]] \
-+                && _filedir
-+            ;;
-     esac
- 
- 
-@@ -37,17 +37,14 @@
- 
- 
-     if [[ "$cur" != -* ]]; then
--        _filedir '@(py|pyc|pyo)'
-+        _filedir 'py?([co])'
-     else
--        COMPREPLY=( $( compgen -W "- -d -E -h -i -O -Q -S -t -u \
--            -U -v -V -W -x -c" -- "$cur" ) )
-+        COMPREPLY=( $( compgen -W "$( _parse_help $1 -h )" -- "$cur" ) )
-     fi
- 
--
--
-     return 0
- } &&
--complete -F _python -o filenames python
-+complete -F _python python python2 python3
- 
- # Local variables:
- # mode: shell-script