[arch-commits] Commit in bash-completion/trunk (3 files)

[Dave Reisner]

    Date: Tuesday, April 12, 2016 @ 14:28:43
  Author: dreisner
Revision: 264711

upgpkg: bash-completion 2.3-1

- drop backported fixes
- update upstream URL and source location
- remove umount/mount completions for compatibility with util-linux 2.28

Modified:
  bash-completion/trunk/PKGBUILD
Deleted:
  bash-completion/trunk/bash-completion-lz4.patch
  bash-completion/trunk/words_bad_array_subscript.patch

---------------------------------+
 PKGBUILD                        |   27 +++++++++++----------------
 bash-completion-lz4.patch       |   10 ----------
 words_bad_array_subscript.patch |   13 -------------
 3 files changed, 11 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-12 12:17:05 UTC (rev 264710)
+++ PKGBUILD	2016-04-12 12:28:43 UTC (rev 264711)
@@ -2,30 +2,22 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=bash-completion
-pkgver=2.1
-pkgrel=5
+pkgver=2.3
+pkgrel=1
 pkgdesc="Programmable completion for the bash shell"
 arch=('any')
-url="http://bash-completion.alioth.debian.org/"
-license=('GPL')
+url="https://github.com/scop/bash-completion"
+license=('GPL2')
 depends=('bash')
 options=('!emptydirs' '!makeflags')
-#http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2
-source=('http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=snapshot;h=867282a7341ccfff9a0e8a8ef6bba6e781b66afb;sf=tgz'
-        bash-4.3.patch bash-completion-lz4.patch words_bad_array_subscript.patch)
-sha1sums=('153a8d056d0f5cdc22477ebfa13c1a461ff95556'
-          'd2a01350990c1221bd53d55edf31210c74d02bca'
-          'a8cdbadacdce845ec69575e1046c197d54e64074'
-          'ae1d9a334e4908464b339f929dd5874c2af11bd2')
+source=("https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz"
+        'bash-4.3.patch')
+sha1sums=('6b42d6747dab48bdc983627e8ce69283ff0e6b79'
+          'd2a01350990c1221bd53d55edf31210c74d02bca')
 
 prepare() {
-  rm -rf ${pkgname}-${pkgver}
-  mv ${pkgname}-867282a ${pkgname}-${pkgver}
   cd ${pkgname}-${pkgver}
   patch -p1 -i ../bash-4.3.patch
-  patch -p0 -i ../bash-completion-lz4.patch
-  patch -p1 -i ../words_bad_array_subscript.patch
-  autoreconf --install
 }
 
 build() {
@@ -43,4 +35,7 @@
 
 # remove Slackware's makepkg completion
   rm "${pkgdir}/usr/share/bash-completion/completions/makepkg"
+
+# remove completions which overlap with util-linux
+  rm "${pkgdir}/usr/share/bash-completion/completions"/{u,}mount
 }

Deleted: bash-completion-lz4.patch
===================================================================
--- bash-completion-lz4.patch	2016-04-12 12:17:05 UTC (rev 264710)
+++ bash-completion-lz4.patch	2016-04-12 12:28:43 UTC (rev 264711)
@@ -1,10 +0,0 @@
---- completions/Makefile.am.orig	2014-03-20 19:31:07.341541256 -0400
-+++ completions/Makefile.am	2014-03-20 19:31:33.357950340 -0400
-@@ -195,6 +195,7 @@
- 		luseradd \
- 		luserdel \
- 		lvm \
-+		lz4 \
- 		lzip \
- 		lzma \
- 		lzop \

Deleted: words_bad_array_subscript.patch
===================================================================
--- words_bad_array_subscript.patch	2016-04-12 12:17:05 UTC (rev 264710)
+++ words_bad_array_subscript.patch	2016-04-12 12:28:43 UTC (rev 264711)
@@ -1,13 +0,0 @@
-diff --git a/bash_completion b/bash_completion
-index 66d36b1..ce469d0 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -707,7 +707,7 @@ _init_completion()
-         fi
-     done
- 
--    [[ $cword -eq 0 ]] && return 1
-+    [[ $cword -le 0 ]] && return 1
-     prev=${words[cword-1]}
- 
-     [[ ${split-} ]] && _split_longopt && split=true