From 5382ac6cc62a7f572540fbc38d6c1fb0e4a1e8ba Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Mar 02 2006 21:12:24 +0000 Subject: - 20060301, patches and profile.d scriptlet applied/included upstream. - Convert docs to UTF-8. --- diff --git a/.cvsignore b/.cvsignore index 1c0eed3..e658700 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bash-completion-20050721.tar.bz2 +bash-completion-20060301.tar.bz2 diff --git a/bash-completion-20050721-bash31quoting.patch b/bash-completion-20050721-bash31quoting.patch deleted file mode 100644 index b031404..0000000 --- a/bash-completion-20050721-bash31quoting.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- bash_completion/bash_completion~ 2005-07-21 22:21:22.000000000 +0300 -+++ bash_completion/bash_completion 2006-01-08 17:31:57.000000000 +0200 -@@ -661,4 +661,4 @@ - COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host | -- sed -ne '/^['$'\t '']*Sharename/,/^$/p' | -- sed -ne '3,$s|^[^A-Za-z]*\([^'$'\t '']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) ) -+ sed -ne '/^[\t ]*Sharename/,/^$/p' | -+ sed -ne '3,$s|^[^A-Za-z]*\([^\t ]*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) ) - fi -@@ -2398,5 +2398,5 @@ - # expand path (if present) to global known hosts file -- global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) ) -+ global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) ) - # expand path (if present) to user known hosts file -- user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) ) -+ user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) ) - fi -@@ -2476,3 +2476,3 @@ - if [ ${#config[@]} -gt 0 ] && [ -n "$aliases" ]; then -- hosts=$( compgen -W "$( sed -ne "s/^[Hh][Oo][Ss][Tt]["$'\t '"]*\([^*?]*\)$/\1/p" ${config[@]} )" -- $ocur ) -+ hosts=$( compgen -W '$( sed -ne "s/^[Hh][Oo][Ss][Tt][\t ]*\([^*?]*\)$/\1/p" ${config[@]} )' -- $ocur ) - COMPREPLY=( ${COMPREPLY[@]} $hosts ) -@@ -5860,3 +5860,3 @@ - dict $host $port $1 2>/dev/null | sed -ne \ -- 's/^['$'\t '']['$'\t '']*\([^'$'\t '']*\).*$/\1/p' -+ 's/^[\t ][\t ]*\([^\t ]*\).*$/\1/p' - } ---- bash_completion/contrib/sitecopy~ 2005-01-03 04:44:22.000000000 +0200 -+++ bash_completion/contrib/sitecopy 2006-01-08 17:35:19.000000000 +0200 -@@ -20,7 +20,7 @@ - ;; - *) - if [ -r ~/.sitecopyrc ]; then -- COMPREPLY=( $( compgen -W "$(grep '^["$'\t '"]*site' ~/.sitecopyrc | awk '{print $2}')" -- $cur ) ) -+ COMPREPLY=( $( compgen -W "$(grep '^[\t ]*site' ~/.sitecopyrc | awk '{print $2}')" -- $cur ) ) - fi - ;; - esac diff --git a/bash-completion-20050721-cvs-stat.patch b/bash-completion-20050721-cvs-stat.patch deleted file mode 100644 index ed36bd7..0000000 --- a/bash-completion-20050721-cvs-stat.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- bash_completion~ 2005-07-21 22:21:22.000000000 +0300 -+++ bash_completion 2005-09-21 17:25:01.000000000 +0300 -@@ -1544,7 +1544,7 @@ - @(rtag|rfreeze)) - mode=rtag - ;; -- st?(atus)) -+ st?(at?(us))) - mode=status - ;; - @(tag|freeze)) -@@ -1697,7 +1697,7 @@ - commit diff delete edit export \ - freeze get history import log new \ - patch rcs rdiff release remove \ -- rfreeze rlog rm rtag status tag \ -+ rfreeze rlog rm rtag stat status tag \ - unedit up update -H -Q -q -b -d -e \ - -f -l -n -t -r -v -w -x -z --help \ - --version' -- $cur ) ) diff --git a/bash-completion-20050721-mtr.patch b/bash-completion-20050721-mtr.patch deleted file mode 100644 index 302cce0..0000000 --- a/bash-completion-20050721-mtr.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- bash_completion~ 2005-07-21 22:21:22.000000000 +0300 -+++ bash_completion 2006-02-04 21:05:17.000000000 +0200 -@@ -2492,3 +2492,3 @@ - complete -F _known_hosts traceroute traceroute6 tracepath tracepath6 \ -- ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys -+ ping fping telnet host nslookup rsh rlogin ftp dig ssh-installkeys mtr - diff --git a/bash-completion.profile b/bash-completion.profile deleted file mode 100644 index 3264537..0000000 --- a/bash-completion.profile +++ /dev/null @@ -1,14 +0,0 @@ -# check for bash (and that we haven't already been sourced, see eg. #174355) -[ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return - -# skip non-interactive shells -[[ $- == *i* ]] || return - -# check for correct version of bash -bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} -if [ -r /etc/bash_completion ] && \ - [ $bmajor -eq 2 -a $bminor '>' 04 -o $bmajor -gt 2 ] ; then - # source completion code - . /etc/bash_completion -fi -unset bash bminor bmajor diff --git a/bash-completion.spec b/bash-completion.spec index 5f5c55f..f721118 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -1,19 +1,15 @@ Name: bash-completion -Version: 20050721 -Release: 4%{?dist} +Version: 20060301 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 -Source1: %{name}.profile Source2: %{name}-mock Source3: %{name}-repomanage Source4: %{name}-plague-client -Patch0: %{name}-20050721-cvs-stat.patch -Patch1: %{name}-20050721-bash31quoting.patch -Patch2: %{name}-20050721-mtr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,9 +22,7 @@ of the programmable completion feature of bash 2. %prep %setup -q -n bash_completion -%patch0 -%patch1 -p1 -%patch2 +f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f install -pm 644 %{SOURCE2} contrib/mock install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage @@ -41,8 +35,7 @@ install -pm 644 %{SOURCE3} contrib/repomanage rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir} -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/bash_completion.sh +install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name} install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d @@ -81,7 +74,6 @@ fi\ %bashcomp_trigger ruby-ri ri %bashcomp_trigger sbcl %bashcomp_trigger snownews -%bashcomp_trigger subversion %bashcomp_trigger unace %bashcomp_trigger unixODBC isql %bashcomp_trigger unrar @@ -98,6 +90,10 @@ fi\ %changelog +* Thu Mar 2 2006 Ville Skyttä - 20060301-1 +- 20060301, patches and profile.d scriptlet applied/included upstream. +- Convert docs to UTF-8. + * Wed Feb 8 2006 Ville Skyttä - 20050721-4 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod). - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews. diff --git a/sources b/sources index 4711a45..a4c62cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4de9f0dee0663f08b5e24f64490e642e bash-completion-20050721.tar.bz2 +ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2