rpms/bash-completion/EL-4 bash-completion-20060301-debian.patch, NONE, 1.1 bash-completion-20060301-scp-apos-217178.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 bash-completion-mock, 1.1, 1.2 bash-completion.spec, 1.8, 1.9 sources, 1.7, 1.8 bash-completion-20050721-bash31quoting.patch, 1.1, NONE bash-completion-20050721-cvs-stat.patch, 1.1, NONE bash-completion-20050721-mtr.patch, 1.1, NONE bash-completion.profile, 1.3, NONE
Jeff Sheltren (sheltren)
fedora-extras-commits at redhat.com
Sun Jun 24 17:46:47 UTC 2007
Author: sheltren
Update of /cvs/extras/rpms/bash-completion/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25720
Modified Files:
.cvsignore bash-completion-mock bash-completion.spec sources
Added Files:
bash-completion-20060301-debian.patch
bash-completion-20060301-scp-apos-217178.patch
Removed Files:
bash-completion-20050721-bash31quoting.patch
bash-completion-20050721-cvs-stat.patch
bash-completion-20050721-mtr.patch bash-completion.profile
Log Message:
Update to latest bash-completion and spec
Remove unused patches
bash-completion-20060301-debian.patch:
--- NEW FILE bash-completion-20060301-debian.patch ---
--- bash_completion~ 2007-02-28 01:11:44.000000000 +0200
+++ bash_completion 2007-02-28 01:11:44.000000000 +0200
@@ -806,7 +806,7 @@
[ $UNAME = GNU -o $UNAME = Linux -o $UNAME = Darwin \
-o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
-o $UNAME = OpenBSD ] && \
-complete -F _man $filenames man
+complete -F _man $filenames man apropos whatis
# renice(8) completion
#
@@ -3325,7 +3323,7 @@
have bzip2 &&
_bzip2()
{
- local cur prev xspec
+ local cur prev xspec IFS=$'\t\n'
COMPREPLY=()
cur=${COMP_WORDS[COMP_CWORD]}
bash-completion-20060301-scp-apos-217178.patch:
--- NEW FILE bash-completion-20060301-scp-apos-217178.patch ---
--- bash_completion~ 2006-03-01 18:20:18.000000000 +0200
+++ bash_completion 2006-12-26 14:01:59.000000000 +0200
@@ -2589,6 +2589,7 @@
COMPREPLY=( $( ssh -o 'Batchmode yes' $userhost \
command ls -aF1d "$path*" 2>/dev/null | \
sed -e 's/[][(){}<>",:;^&!$&=?`|\ ]/\\\\\\&/g' \
+ -e "s/'/\\\\\\\\\\\\&/g" \
-e 's/[*@|=]$//g' -e 's/[^\/]$/& /g' ) )
return 0
fi
@@ -2597,6 +2598,7 @@
COMPREPLY=( ${COMPREPLY[@]} $( command ls -aF1d $cur* \
2>/dev/null | sed \
-e 's/[][(){}<>",:;^&!$&=?`|\ ]/\\&/g' \
+ -e "s/'/\\\\&/g" \
-e 's/[*@|=]$//g' -e 's/[^\/]$/& /g' ) )
return 0
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 11 Feb 2006 10:05:58 -0000 1.7
+++ .cvsignore 24 Jun 2007 17:46:10 -0000 1.8
@@ -1 +1 @@
-bash-completion-20050721.tar.bz2
+bash-completion-20060301.tar.bz2
Index: bash-completion-mock
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/EL-4/bash-completion-mock,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion-mock 11 Feb 2006 10:05:59 -0000 1.1
+++ bash-completion-mock 24 Jun 2007 17:46:10 -0000 1.2
@@ -2,19 +2,28 @@
_mock()
{
- local cur prev
+ local cur prev commands cfgdir
COMPREPLY=()
cur=${COMP_WORDS[COMP_CWORD]}
prev=${COMP_WORDS[COMP_CWORD-1]}
+ commands='rebuild chroot init clean shell'
+ cfgdir=/etc/mock
+
+ count=0
+ for i in ${COMP_WORDS[@]} ; do
+ [ $count -eq $COMP_CWORD ] && break
+ [ "$i" == --configdir ] && cfgdir="${COMP_WORDS[((count+1))]}"
+ count=$((++count))
+ done
case $prev in
- --@(result|state)dir)
+ --@(config|result|state)dir)
_filedir -d
return 0
;;
-r)
- COMPREPLY=( $( command ls /etc/mock | \
+ COMPREPLY=( $( command ls $cfgdir | \
sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
return 0
;;
@@ -23,9 +32,11 @@
;;
esac
+ # TODO: process $commands
if [[ "$cur" == -* ]] ; then
COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
- --debug --resultdir --statedir --uniqueext' -- $cur ) )
+ --debug --resultdir --statedir --uniqueext --configdir --quiet \
+ --autocache --rebuildcache' -- $cur ) )
else
_filedir '?(no)src.rpm'
fi
Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/EL-4/bash-completion.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bash-completion.spec 12 Feb 2006 15:48:26 -0000 1.8
+++ bash-completion.spec 24 Jun 2007 17:46:10 -0000 1.9
@@ -1,19 +1,17 @@
Name: bash-completion
-Version: 20050721
-Release: 4%{?dist}.1
+Version: 20060301
+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/%{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
+Patch0: %{name}-20060301-scp-apos-217178.patch
+Patch1: %{name}-20060301-debian.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -27,8 +25,8 @@
%prep
%setup -q -n bash_completion
%patch0
-%patch1 -p1
-%patch2
+%patch1
+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 +39,7 @@
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
@@ -58,138 +55,121 @@
rm -rf $RPM_BUILD_ROOT
+%define do_triggerin() if [ ! -e %{_sysconfdir}/bash_completion.d/%1 ] ; then ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || : ; fi
+%define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
+
+# Not handled (yet?):
+# bitkeeper, dsniff, harbour, larch, lisp, p4, povray, sitecopy
+
%triggerin -- bittorrent
-if [ ! -e %{_sysconfdir}/bash_completion.d/bittorrent ] ; then
- ln -s %{_datadir}/%{name}/bittorrent %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin bittorrent
%triggerun -- bittorrent
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/bittorrent
+%do_triggerun bittorrent
%triggerin -- cksfv
-if [ ! -e %{_sysconfdir}/bash_completion.d/cksfv ] ; then
- ln -s %{_datadir}/%{name}/cksfv %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin cksfv
%triggerun -- cksfv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/cksfv
+%do_triggerun cksfv
%triggerin -- clisp
-if [ ! -e %{_sysconfdir}/bash_completion.d/clisp ] ; then
- ln -s %{_datadir}/%{name}/clisp %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin clisp
%triggerun -- clisp
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/clisp
+%do_triggerun clisp
%triggerin -- freeciv
-if [ ! -e %{_sysconfdir}/bash_completion.d/freeciv ] ; then
- ln -s %{_datadir}/%{name}/freeciv %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin freeciv
%triggerun -- freeciv
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/freeciv
+%do_triggerun freeciv
%triggerin -- gcc-gnat
-if [ ! -e %{_sysconfdir}/bash_completion.d/gnatmake ] ; then
- ln -s %{_datadir}/%{name}/gnatmake %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin gnatmake
%triggerun -- gcc-gnat
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gnatmake
+%do_triggerun gnatmake
+
+%triggerin -- gcl
+%do_triggerin gcl
+%triggerun -- gcl
+%do_triggerun gcl
%triggerin -- gkrellm
-if [ ! -e %{_sysconfdir}/bash_completion.d/gkrellm ] ; then
- ln -s %{_datadir}/%{name}/gkrellm %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin gkrellm
%triggerun -- gkrellm
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gkrellm
+%do_triggerun gkrellm
+
+%triggerin -- lilypond
+%do_triggerin lilypond
+%triggerun -- lilypond
+%do_triggerun lilypond
%triggerin -- mailman
-if [ ! -e %{_sysconfdir}/bash_completion.d/mailman ] ; then
- ln -s %{_datadir}/%{name}/mailman %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin mailman
%triggerun -- mailman
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mailman
+%do_triggerun mailman
%triggerin -- mcrypt
-if [ ! -e %{_sysconfdir}/bash_completion.d/mcrypt ] ; then
- ln -s %{_datadir}/%{name}/mcrypt %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin mcrypt
%triggerun -- mcrypt
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mcrypt
+%do_triggerun mcrypt
+
+%triggerin -- mercurial
+%do_triggerin hg
+%triggerun -- mercurial
+%do_triggerun hg
%triggerin -- mock
-if [ ! -e %{_sysconfdir}/bash_completion.d/mock ] ; then
- ln -s %{_datadir}/%{name}/mock %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin mock
%triggerun -- mock
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mock
+%do_triggerun mock
%triggerin -- mtx
-if [ ! -e %{_sysconfdir}/bash_completion.d/mtx ] ; then
- ln -s %{_datadir}/%{name}/mtx %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin mtx
%triggerun -- mtx
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mtx
+%do_triggerun mtx
+
+%triggerin -- perl-SVK
+%do_triggerin svk
+%triggerun -- perl-SVK
+%do_triggerun svk
%triggerin -- plague-client
-if [ ! -e %{_sysconfdir}/bash_completion.d/plague-client ] ; then
- ln -s %{_datadir}/%{name}/plague-client %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin plague-client
%triggerun -- plague-client
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/plague-client
+%do_triggerun plague-client
%triggerin -- ruby-ri
-if [ ! -e %{_sysconfdir}/bash_completion.d/ri ] ; then
- ln -s %{_datadir}/%{name}/ri %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin ri
%triggerun -- ruby-ri
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/ri
+%do_triggerun ri
%triggerin -- sbcl
-if [ ! -e %{_sysconfdir}/bash_completion.d/sbcl ] ; then
- ln -s %{_datadir}/%{name}/sbcl %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin sbcl
%triggerun -- sbcl
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/sbcl
+%do_triggerun sbcl
%triggerin -- snownews
-if [ ! -e %{_sysconfdir}/bash_completion.d/snownews ] ; then
- ln -s %{_datadir}/%{name}/snownews %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin snownews
%triggerun -- snownews
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/snownews
-
-%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
+%do_triggerun snownews
%triggerin -- unace
-if [ ! -e %{_sysconfdir}/bash_completion.d/unace ] ; then
- ln -s %{_datadir}/%{name}/unace %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin unace
%triggerun -- unace
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unace
+%do_triggerun unace
%triggerin -- unixODBC
-if [ ! -e %{_sysconfdir}/bash_completion.d/isql ] ; then
- ln -s %{_datadir}/%{name}/isql %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin isql
%triggerun -- unixODBC
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/isql
+%do_triggerun isql
%triggerin -- unrar
-if [ ! -e %{_sysconfdir}/bash_completion.d/unrar ] ; then
- ln -s %{_datadir}/%{name}/unrar %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin unrar
%triggerun -- unrar
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unrar
+%do_triggerun unrar
%triggerin -- yum-utils
-if [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then
- ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d
-fi
+%do_triggerin repomanage
%triggerun -- yum-utils
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/repomanage
+%do_triggerun repomanage
%files -f %{name}-ghosts.list
@@ -202,9 +182,20 @@
%changelog
-* Sun Feb 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4.1
-- Revert back to expanded triggers, rpmbuild < 4.4 doesn't like the
- macroized syntax.
+* Sun Jun 24 2007 Jeff Sheltren <sheltren at cs.ucsb.edu> - 20060301-4
+- Update triggers to work with older versions of RPM
+
+* Wed Feb 28 2007 Ville Skyttä <ville.skytta at iki.fi> - 20060301-3
+- Fix scp with single quotes (#217178).
+- Borrow fix for bzip2 w/spaces, and apropos and whatis support from Debian.
+
+* Thu Aug 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060301-2
+- Trigger-install support for gcl, lilypond, mercurial and svk.
+- Improve mock completion a bit.
+
+* Thu Mar 2 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060301-1
+- 20060301, patches and profile.d scriptlet applied/included upstream.
+- Convert docs to UTF-8.
* Wed Feb 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4
- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/EL-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 11 Feb 2006 10:05:59 -0000 1.7
+++ sources 24 Jun 2007 17:46:10 -0000 1.8
@@ -1 +1 @@
-4de9f0dee0663f08b5e24f64490e642e bash-completion-20050721.tar.bz2
+ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2
--- bash-completion-20050721-bash31quoting.patch DELETED ---
--- bash-completion-20050721-cvs-stat.patch DELETED ---
--- bash-completion-20050721-mtr.patch DELETED ---
--- bash-completion.profile DELETED ---
More information about the fedora-extras-commits
mailing list