diff --git a/.cvsignore b/.cvsignore index 576e507..813eda3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bash-completion-20090115bzr1252.tar.bz2 +bash-completion-20090211git47d0c5b.tar.gz diff --git a/bash-completion-lzop b/bash-completion-lzop deleted file mode 100644 index 59a7a42..0000000 --- a/bash-completion-lzop +++ /dev/null @@ -1,53 +0,0 @@ -# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*- -# ex: ts=8 sw=8 noet filetype=sh -# -# lzop(1) completion - -have lzop && -_lzop() -{ - local cur prev xspec - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - # TODO: -p: takes a dir argument, without a separating space - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '-d -x -l -t -h -I -V -L -1 -2 -3 \ - -4 -5 -6 -7 -8 -9 -q -v -c -f -F -n -N -P -k -U -o \ - -S --fast --best --decompress --uncompress --extract \ - --test --list --ls --info --sysinfo --license --help \ - --version --stdout --to-stdout --output --path \ - --force --no-checksum --no-name --name --no-mode \ - --no-time --suffix --keep --unlink --delete --crc32 \ - --no-warn --ignore-warn --quiet --silent --verbose \ - --no-stdin --filter --checksum --no-color --mono \ - --color' -- $cur ) ) - return 0 - fi - - case "$prev" in - -o|--output) _filedir ; return 0 ;; - --path) _filedir -d ; return 0 ;; - -S|--suffix) return 0 ;; - esac - - xspec="*.?(t)lzo" - case "$prev" in - --@(@(de|un)compress|extract|list|ls|info|test)) - xspec="!"$xspec ;; - --force) xspec= ;; - --*) ;; - -*f*|'<'|'>') xspec= ;; - -*[dltx]*) xspec="!"$xspec ;; - esac - - _expand || return 0 - - local IFS=$'\t\n' - COMPREPLY=( $( compgen -f -X "$xspec" -- $cur ) \ - $( compgen -d -- $cur ) ) -} && -complete -F _lzop $filenames lzop diff --git a/bash-completion-repomanage b/bash-completion-repomanage deleted file mode 100644 index d932496..0000000 --- a/bash-completion-repomanage +++ /dev/null @@ -1,24 +0,0 @@ -# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*- -# ex: ts=8 sw=8 noet filetype=sh -# -# bash completion for repomanage - -have repomanage && -_repomanage() -{ - local cur prev - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - [[ "$prev" == -@(h|-help|k|-keep) ]] && return 0 - - if [[ "$cur" == -* ]] ; then - COMPREPLY=( $( compgen -W '-o --old -n --new -s --space -k \ - --keep -c --nocheck -h --help' -- $cur ) ) - else - _filedir -d - fi -} && -complete -F _repomanage $filenames repomanage diff --git a/bash-completion-snapshot.sh b/bash-completion-snapshot.sh index eb52213..fd4b25f 100644 --- a/bash-completion-snapshot.sh +++ b/bash-completion-snapshot.sh @@ -1,11 +1,11 @@ #!/bin/sh if [ -z "$1" -o $# -ne 1 ]; then - echo "Usage: $0 " + echo "Usage: $0 " exit 2 fi rev="$1" -url=http://bzr.debian.org/bzr/bash-completion/current +url="http://git.debian.org/?p=bash-completion/bash-completion.git;a=snapshot;h=$rev;sf=tgz" -bzr export -r $rev bash-completion-$(date +%Y%m%d)bzr$rev.tar.bz2 $url +curl "$url" > bash-completion-$(date +%Y%m%d)git${rev:0:7}.tar.gz diff --git a/bash-completion.spec b/bash-completion.spec index 4f24f61..cef6a01 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -1,4 +1,4 @@ -%define snap 20090115bzr1252 +%define snap 20090211git47d0c5b Name: bash-completion Version: 20080705 @@ -10,14 +10,12 @@ License: GPLv2+ URL: http://bash-completion.alioth.debian.org/ # Snapshot tarballs created with Source99 %if 0%{?snap:1} -Source0: %{name}-%{snap}.tar.bz2 +Source0: %{name}-%{snap}.tar.gz %else Source0: http://ftp.debian.org/debian/pool/main/b/bash-completion/%{name}_%{version}.tar.gz %endif -Source1: %{name}-lzop -Source2: %{name}-mock -Source3: %{name}-repomanage -Source4: %{name}-plague-client +Source1: %{name}-mock +Source2: %{name}-plague-client Source99: %{name}-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -30,11 +28,10 @@ of the programmable completion feature of bash 2. %prep -%setup -q -n %{name}%{?snap:-%{snap}} -install -pm 644 %{SOURCE1} contrib/lzop -install -pm 644 %{SOURCE2} contrib/mock -install -pm 644 %{SOURCE3} contrib/repomanage -install -pm 644 %{SOURCE4} contrib/plague-client +%setup -q -n %{name} +install -pm 644 %{SOURCE1} contrib/mock +install -pm 644 %{SOURCE2} contrib/plague-client +mv to_review/repomanage contrib/ rm contrib/hg # Updated version shipped in the mercurial package %build @@ -71,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- bittorrent %do_triggerun bittorrent +%triggerin -- bridge-utils +%do_triggerin brctl +%triggerun -- bridge-utils +%do_triggerun brctl + %triggerin -- cksfv %do_triggerin cksfv %triggerun -- cksfv @@ -81,6 +83,11 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- clisp %do_triggerun clisp +%triggerin -- cowsay +%do_triggerin cowsay +%triggerun -- cowsay +%do_triggerun cowsay + %triggerin -- dsniff %do_triggerin dsniff %triggerun -- dsniff @@ -136,6 +143,11 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- mcrypt %do_triggerun mcrypt +%triggerin -- minicom +%do_triggerin minicom +%triggerun -- minicom +%do_triggerun minicom + %triggerin -- mock %do_triggerin mock %triggerun -- mock @@ -151,11 +163,21 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- mtx %do_triggerun mtx +%triggerin -- net-tools +%do_triggerin net-tools +%triggerun -- net-tools +%do_triggerun net-tools + %triggerin -- openssh-clients %do_triggerin ssh %triggerun -- openssh-clients %do_triggerun ssh +%triggerin -- perl-CPANPLUS +%do_triggerin cpan2dist +%triggerun -- perl-CPANPLUS +%do_triggerun cpan2dist + %triggerin -- perl-SVK %do_triggerin svk %triggerun -- perl-SVK @@ -166,6 +188,16 @@ rm -rf $RPM_BUILD_ROOT %triggerun -- plague-client %do_triggerun plague-client +%triggerin -- qemu +%do_triggerin qemu +%triggerun -- qemu +%do_triggerun qemu + +%triggerin -- quota +%do_triggerin quota-tools +%triggerun -- quota +%do_triggerun quota-tools + %triggerin -- qt %do_triggerin qdbus %triggerun -- qt @@ -227,6 +259,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 11 2009 Ville Skyttä - 20080705-2.20090211git47d0c5b +- git snapshot 47d0c5b, fixes #484578. +- lzop and repomanage completions included upstream. + * Sun Jan 18 2009 Ville Skyttä - 20080705-2.20090115bzr1252 - r1252 snapshot; all patches applied upstream. - Do not install mercurial completion, an updated version is shipped with it. diff --git a/sources b/sources index 28b88e0..6f08606 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69a699369cd0dd836e9b93d7eed71f65 bash-completion-20090115bzr1252.tar.bz2 +a77bd9866e1a617972c00bc843470ba3 bash-completion-20090211git47d0c5b.tar.gz