rpms/bash-completion/devel bash-completion-1.1-vncviewer.patch, NONE, 1.1 bash-completion.spec, 1.47, 1.48
Ville Skyttä
scop at fedoraproject.org
Sat Dec 26 11:52:25 UTC 2009
- Previous message: rpms/perl-CGI-Application-Plugin-DevPopup/devel .cvsignore, 1.3, 1.4 perl-CGI-Application-Plugin-DevPopup.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/bash-completion/EL-5 bash-completion-1.1-vncviewer.patch, NONE, 1.1 bash_completion.sh, NONE, 1.1 .cvsignore, 1.11, 1.12 bash-completion.spec, 1.20, 1.21 sources, 1.11, 1.12 bash-completion-1.0-bash4quoting-490322.patch, 1.1, NONE bash-completion-mock, 1.3, NONE bash-completion-repomanage, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20134
Modified Files:
bash-completion.spec
Added Files:
bash-completion-1.1-vncviewer.patch
Log Message:
* Sat Dec 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.1-5
- Apply upstream post 1.1 generic vncviewer fixes.
- Autoinstall vncviewer completion also on tigervnc.
- Autoinstall chsh completion also on util-linux.
bash-completion-1.1-vncviewer.patch:
vncviewer | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
--- NEW FILE bash-completion-1.1-vncviewer.patch ---
diff --git a/contrib/vncviewer b/contrib/vncviewer
index 1e6e3eb..d3e5c59 100644
--- a/contrib/vncviewer
+++ b/contrib/vncviewer
@@ -1,22 +1,27 @@
# bash completion for vncviewer
have vncviewer &&
-_vncviewer_bootstrap() {
+_vncviewer_bootstrap()
+{
local fname
case "$(_realcommand vncviewer)" in
- # If `vncviewer' not installed, default file-dir completion
- '') _filedir `_get_cword` ;;
*xvnc4viewer) fname=_xvnc4viewer ;;
- *tightvncviewer|*) fname=_tightvncviewer ;;
+ *tightvncviewer) fname=_tightvncviewer ;;
+ *) fname=_vncviewer ;;
esac
- if [ $fname ]; then
- # Install real completion for subsequent completions
- complete -F $fname vncviewer
- $fname # Generate completions once for now
- unset -f _vncviewer_bootstrap
- fi
+
+ # Install real completion for subsequent completions
+ complete -F $fname vncviewer
+ $fname # Generate completions once for now
+ unset -f _vncviewer_bootstrap
} &&
-complete -F _vncviewer_bootstrap vncviewer
+complete -F _vncviewer_bootstrap vncviewer &&
+_vncviewer()
+{
+ COMPREPLY=()
+ local cur=`_get_cword`
+ _known_hosts_real "$cur"
+}
have tightvncviewer &&
_tightvncviewer()
Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- bash-completion.spec 15 Dec 2009 22:12:10 -0000 1.47
+++ bash-completion.spec 26 Dec 2009 11:52:25 -0000 1.48
@@ -1,6 +1,6 @@
Name: bash-completion
Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
Summary: Programmable completion for Bash
@@ -13,6 +13,8 @@ Source1: %{name}-plague-client
Source2: http://bash-completion.alioth.debian.org/files/CHANGES-1.1
# http://git.debian.org/?p=bash-completion/bash-completion.git;a=blob_plain;f=bash_completion.sh;h=915960b614ef7644f9abaa99ed9ef0faa7ac5477;hb=HEAD
Source3: bash_completion.sh
+# From upstream post 1.1.
+Patch0: %{name}-1.1-vncviewer.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -27,6 +29,7 @@ of the programmable completion feature o
%prep
%setup -q
+%patch0 -p1
install -pm 644 %{SOURCE1} contrib/plague-client
install -pm 644 %{SOURCE2} CHANGES
install -pm 644 %{SOURCE3} bash_completion.sh
@@ -122,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
%bashcomp_trigger bzip2
%bashcomp_trigger cfengine
%bashcomp_trigger chkconfig
-%bashcomp_trigger chsh util-linux-ng
+%bashcomp_trigger chsh util-linux-ng,util-linux
%bashcomp_trigger cksfv
%bashcomp_trigger clisp
%bashcomp_trigger cpan2dist perl-CPANPLUS
@@ -246,7 +249,7 @@ fi
%bashcomp_trigger tcpdump
%bashcomp_trigger unace
%bashcomp_trigger unrar
-%bashcomp_trigger vncviewer vnc
+%bashcomp_trigger vncviewer tigervnc,vnc
%bashcomp_trigger vpnc
%bashcomp_trigger wireless-tools
%bashcomp_trigger wodim
@@ -289,6 +292,11 @@ fi
%changelog
+* Sat Dec 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.1-5
+- Apply upstream post 1.1 generic vncviewer fixes.
+- Autoinstall vncviewer completion also on tigervnc.
+- Autoinstall chsh completion also on util-linux.
+
* Tue Dec 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.1-4
- Fix autoinstall of completions named other than the package (#546905).
- Use environment-modules upstream completion instead of ours if available.
- Previous message: rpms/perl-CGI-Application-Plugin-DevPopup/devel .cvsignore, 1.3, 1.4 perl-CGI-Application-Plugin-DevPopup.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/bash-completion/EL-5 bash-completion-1.1-vncviewer.patch, NONE, 1.1 bash_completion.sh, NONE, 1.1 .cvsignore, 1.11, 1.12 bash-completion.spec, 1.20, 1.21 sources, 1.11, 1.12 bash-completion-1.0-bash4quoting-490322.patch, 1.1, NONE bash-completion-mock, 1.3, NONE bash-completion-repomanage, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list