Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9f916f951e57cba750010943bad5efd15588ac5b
commit 9f916f951e57cba750010943bad5efd15588ac5b Author: DeX77 <[email protected]> Date: Thu Aug 27 22:51:03 2015 +0200 bash-completion-2.1-4-x86_64 * fix conflicts.. again diff --git a/source/apps/bash-completion/FrugalBuild b/source/apps/bash-completion/FrugalBuild index 422a7c1..f357b14 100644 --- a/source/apps/bash-completion/FrugalBuild +++ b/source/apps/bash-completion/FrugalBuild @@ -3,7 +3,7 @@ pkgname=bash-completion pkgver=2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Programmable completion for bash" url='http://bash-completion.alioth.debian.org/' depends=('bash') @@ -26,6 +26,10 @@ build() { Ffile "${BASH_COMPLETION_PATH}"/completions/frugalware Frm "${BASH_COMPLETION_PATH}"/completions/{nmcli,service} + #Conflicts with util-linux + Frm "${BASH_COMPLETION_PATH}"/completions/{cal,dmesg,eject,hexdump,hwclock,ionice,look,renice,rtcwake} + + # Provided by uti-linux - Frm ${BASH_COMPLETION_PATH}"/completions/{cal,chsh,dmesg,eject,hexdump,hwclock,ionice,look,renice,rtcwake,su} + Frm "${BASH_COMPLETION_PATH}"/completions/{cal,chsh,dmesg,eject,hexdump,hwclock,ionice,look,renice,rtcwake,su} } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
