]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
bash-completion: Drop files which will be shipped by util-linux for now
authorStefan Schantl <stefan.schantl@ipfire.org>
Tue, 13 Dec 2016 16:12:10 +0000 (17:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 13 Dec 2016 16:23:16 +0000 (16:23 +0000)
The mount and umount binaries have been moved to util-linux and therefore
the bash-completions scripts too.

Drop them from the bash-completion package, because they get maintained
in the util-linux package from now.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
bash-completion/bash-completion.nm

index ac9bcb416d2bfecc1c348969183740362ab84363..867cbe669d61bdc94de735b344eae768143351ac 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = bash-completion
 version    = 2.4
-release    = 1
+release    = 2
 arch       = noarch
 
 groups     = Development/Languages
@@ -25,6 +25,9 @@ build
        install_cmds
                rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{cawsay,cowthink}
 
+               # Drop files which are provided by util-linux >= 2.28
+               rm -rvf %{BUILDROOT}%{datadir}/bash-completion/completions/{mount,umount}
+
                install -Dpm 644 %{DIR_SOURCE}/bash-completion-1.99-redefine_filedir.bash \
                        %{BUILDROOT}%{sysconfdir}/bash_completion.d/redefine_filedir
        end