rpms/bash-completion/FC-3 bash-completion-20050721-bash31quoting.patch, NONE, 1.1 bash-completion-20050721-cvs-stat.patch, NONE, 1.1 bash-completion-20050721-mtr.patch, NONE, 1.1 bash-completion-mock, NONE, 1.1 bash-completion-plague-client, NONE, 1.1 bash-completion-repomanage, NONE, 1.1 .cvsignore, 1.6, 1.7 bash-completion.profile, 1.2, 1.3 bash-completion.spec, 1.6, 1.7 sources, 1.6, 1.7

Ville Skytta (scop) fedora-extras-commits at redhat.com
Sat Feb 11 10:06:00 UTC 2006 

Author: scop

Update of /cvs/extras/rpms/bash-completion/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13136

Modified Files:
	.cvsignore bash-completion.profile bash-completion.spec 
	sources 
Added Files:
	bash-completion-20050721-bash31quoting.patch 
	bash-completion-20050721-cvs-stat.patch 
	bash-completion-20050721-mtr.patch bash-completion-mock 
	bash-completion-plague-client bash-completion-repomanage 
Log Message:
* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4
- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.

* Sat Feb  4 2006 Ville Skyttä <ville.skytta at iki.fi>
- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).

* Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-3
- Patch to hopefully fix quoting problems with bash 3.1 (#177056).

* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-2
- Work around potential login problem in profile.d snippet (#174355).

* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi>
- Don't mark the main source file as %%config.
- Make profile.d snippet non-executable (#35714) and noreplace.
- Add mock, plague-client and repomanage completion.
- Allow "cvs stat" completion.
- Macroize trigger creation.

* Fri Jul 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-1
- 20050721.

* Wed Jul 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050720-1
- 20050720, all patches applied upstream.

* Mon Jul 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050712-1
- 20050712.
- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
- Add/fix support for some multimedia formats and players.
- Fix tarball completion.


bash-completion-20050721-bash31quoting.patch:

--- NEW FILE bash-completion-20050721-bash31quoting.patch ---
--- 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

bash-completion-20050721-cvs-stat.patch:

--- NEW FILE bash-completion-20050721-cvs-stat.patch ---
--- 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 ) )

bash-completion-20050721-mtr.patch:

--- NEW FILE bash-completion-20050721-mtr.patch ---
--- 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
 


--- NEW FILE bash-completion-mock ---
# bash completion for mock                                           -*- sh -*-

_mock()
{
    local cur prev

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}
    prev=${COMP_WORDS[COMP_CWORD-1]}

    case $prev in
        --@(result|state)dir)
            _filedir -d
            return 0
            ;;
        -r)
            COMPREPLY=( $( command ls /etc/mock | \
                sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
            return 0
            ;;
        -@(-arch|-uniqueext|-help|h))
            return 0
            ;;
    esac

    if [[ "$cur" == -* ]] ; then
        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
            --debug --resultdir --statedir --uniqueext' -- $cur ) )
    else
        _filedir '?(no)src.rpm'
    fi
}
complete -F _mock $filenames mock


--- NEW FILE bash-completion-plague-client ---
# bash completion for plague-client                                  -*- sh -*-

_plague_client()
{
    local cur

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}

    [ $COMP_CWORD = 1 ] && \
    COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list \
        list_builders pause requeue unpause update_builders' -- $cur ) )

    return 0
}
complete -F _plague_client plague-client


--- NEW FILE bash-completion-repomanage ---
# bash completion for repomanage                                     -*- sh -*-

_repomanage()
{
    local cur prev

    COMPREPLY=()
    cur=${COMP_WORDS[COMP_CWORD]}
    prev=${COMP_WORDS[COMP_CWORD-1]}

    case $prev in
        -@(h|-help|k|-keep))
            return 0
            ;;
    esac

    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 repomanage


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Feb 2005 18:50:09 -0000	1.6
+++ .cvsignore	11 Feb 2006 10:05:58 -0000	1.7
@@ -1 +1 @@
-bash-completion-20050121.tar.bz2
+bash-completion-20050721.tar.bz2


Index: bash-completion.profile
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/bash-completion.profile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion.profile	27 Nov 2004 15:44:30 -0000	1.2
+++ bash-completion.profile	11 Feb 2006 10:05:59 -0000	1.3
@@ -1,5 +1,8 @@
-# check for bash
-[ -z "$BASH_VERSION" ] && return
+# 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#*.}


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/bash-completion.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- bash-completion.spec	26 Feb 2005 18:50:09 -0000	1.6
+++ bash-completion.spec	11 Feb 2006 10:05:59 -0000	1.7
@@ -1,18 +1,23 @@
 Name:           bash-completion
-Version:        20050121
-Release:        1
-Epoch:          0
+Version:        20050721
+Release:        4%{?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/bash-completion-20050121.tar.bz2
+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
-Requires:       bash >= 0:2.05-12
+Requires:       bash >= 2.05-12
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -21,6 +26,12 @@
 
 %prep
 %setup -q -n bash_completion
+%patch0
+%patch1 -p1
+%patch2
+install -pm 644 %{SOURCE2} contrib/mock
+install -pm 644 %{SOURCE3} contrib/plague-client
+install -pm 644 %{SOURCE3} contrib/repomanage
 
 
 %build
@@ -47,88 +58,79 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%triggerin -- bittorrent
-if [ ! -e %{_sysconfdir}/bash_completion.d/bittorrent ] ; then
-  ln -s %{_datadir}/%{name}/bittorrent %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- bittorrent
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/bittorrent
-
-%triggerin -- cksfv
-if [ ! -e %{_sysconfdir}/bash_completion.d/cksfv ] ; then
-  ln -s %{_datadir}/%{name}/cksfv %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- cksfv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/cksfv
-
-%triggerin -- freeciv
-if [ ! -e %{_sysconfdir}/bash_completion.d/freeciv ] ; then
-  ln -s %{_datadir}/%{name}/freeciv %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- freeciv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/freeciv
-
-%triggerin -- gkrellm
-if [ ! -e %{_sysconfdir}/bash_completion.d/gkrellm ] ; then
-  ln -s %{_datadir}/%{name}/gkrellm %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- gkrellm
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gkrellm
-
-%triggerin -- mailman
-if [ ! -e %{_sysconfdir}/bash_completion.d/mailman ] ; then
-  ln -s %{_datadir}/%{name}/mailman %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mailman
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mailman
-
-%triggerin -- mcrypt
-if [ ! -e %{_sysconfdir}/bash_completion.d/mcrypt ] ; then
-  ln -s %{_datadir}/%{name}/mcrypt %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mcrypt
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mcrypt
-
-%triggerin -- mtx
-if [ ! -e %{_sysconfdir}/bash_completion.d/mtx ] ; then
-  ln -s %{_datadir}/%{name}/mtx %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- mtx
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mtx
-
-%triggerin -- subversion
-if [ ! -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
-  ln -s %{_datadir}/%{name}/subversion %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- subversion
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/subversion
-
-%triggerin -- unace
-if [ ! -e %{_sysconfdir}/bash_completion.d/unace ] ; then
-  ln -s %{_datadir}/%{name}/unace %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- unace
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unace
-
-%triggerin -- unrar
-if [ ! -e %{_sysconfdir}/bash_completion.d/unrar ] ; then
-  ln -s %{_datadir}/%{name}/unrar %{_sysconfdir}/bash_completion.d
-fi
-%triggerun -- unrar
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unrar
+%define bashcomp_trigger() \
+%triggerin -- %1\
+if [ ! -e %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1} ] ; then\
+  ln -s %{_datadir}/%{name}/%{?2}%{!?2:%1} %{_sysconfdir}/bash_completion.d\
+fi\
+%triggerun -- %1\
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1}\
+%{nil}
+
+%bashcomp_trigger bittorrent
+%bashcomp_trigger cksfv
+%bashcomp_trigger clisp
+%bashcomp_trigger freeciv
+%bashcomp_trigger gcc-gnat gnatmake
+%bashcomp_trigger gkrellm
+%bashcomp_trigger mailman
+%bashcomp_trigger mcrypt
+%bashcomp_trigger mock
+%bashcomp_trigger mtx
+%bashcomp_trigger plague-client
+%bashcomp_trigger ruby-ri ri
+%bashcomp_trigger sbcl
+%bashcomp_trigger snownews
+%bashcomp_trigger subversion
+%bashcomp_trigger unace
+%bashcomp_trigger unixODBC isql
+%bashcomp_trigger unrar
+%bashcomp_trigger yum-utils repomanage
 
 
 %files -f %{name}-ghosts.list
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc BUGS Changelog COPYING README
-%config %{_sysconfdir}/bash_completion
-%attr(0755,root,root) %config %{_sysconfdir}/profile.d/*
-%{_datadir}/%{name}
-%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
+%{_sysconfdir}/bash_completion
+%dir %{_sysconfdir}/bash_completion.d/
+%{_datadir}/%{name}/
 
 
 %changelog
-* Sat Jan 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:20050121-1
+* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4
+- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
+- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
+
+* Sat Feb  4 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).
+
+* Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-3
+- Patch to hopefully fix quoting problems with bash 3.1 (#177056).
+
+* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-2
+- Work around potential login problem in profile.d snippet (#174355).
+
+* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Don't mark the main source file as %%config.
+- Make profile.d snippet non-executable (#35714) and noreplace.
+- Add mock, plague-client and repomanage completion.
+- Allow "cvs stat" completion.
+- Macroize trigger creation.
+
+* Fri Jul 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-1
+- 20050721.
+
+* Wed Jul 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050720-1
+- 20050720, all patches applied upstream.
+
+* Mon Jul 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050712-1
+- 20050712.
+- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
+- Add/fix support for some multimedia formats and players.
+- Fix tarball completion.
+
+* Sat Jan 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:20050121-2
 - Update to 20050121.
 
 * Thu Jan 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:20050112-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Feb 2005 18:50:09 -0000	1.6
+++ sources	11 Feb 2006 10:05:59 -0000	1.7
@@ -1 +1 @@
-fafeed562b01a8dee079eb851579f2d2  bash-completion-20050121.tar.bz2
+4de9f0dee0663f08b5e24f64490e642e  bash-completion-20050721.tar.bz2

More information about the scm-commits mailing list