testing/bash-completion: remove conflicting files v1 PROPOSED

Eivind Uggedal: 1
 testing/bash-completion: remove conflicting files

 1 files changed, 26 insertions(+), 1 deletions(-)

[alpine-devel] [PATCH] testing/bash-completion: remove conflicting files Export this patch

remove some completion files conflicting with files provided
upstream from util-linux and networkmanager.
---
 testing/bash-completion/APKBUILD | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

Natanael Copa <ncopa@alpinelinux.org>

11 years ago

applied. thanks!

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---

diff --git a/testing/bash-completion/APKBUILD b/testing/bash-completion/APKBUILD
index fcd11f6494f4..ac8d8c834315 100644
--- a/testing/bash-completion/APKBUILD
+++ b/testing/bash-completion/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=bash-completion
 pkgver=2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Command-line tab-completion for bash"
 url="http://bash-completion.alioth.debian.org/"
 arch="noarch"
@@ -14,6 +14,26 @@ install=""
 source="http://ftp.debian.org/debian/pool/main/b/bash-completion/${pkgname}_${pkgver}.orig.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
+
+# Provided with util-linux and networkmanager:
+_conflicting="
+	cal
+	chsh
+	dmesg
+	eject
+	hd
+	hexdump
+	hwclock
+	ionice
+	look
+	ncal
+	newgrp
+	renice
+	rtcwake
+	su
+	nmcli
+	"
+
 prepare() {
 	local i
 	cd "$_builddir"
@@ -35,6 +55,11 @@ build() {
 package() {
 	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
+
+	cd "$pkgdir"/usr/share/bash-completion/completions
+	for c in $_conflicting; do
+		rm $c
+	done
 }
 
 md5sums="4e2a9f11a4042a38ee79ddcd048e8b9e  bash-completion_2.1.orig.tar.bz2"
-- 
1.8.4.3



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---