From 1a7a342ecd6b7300eb0988b93aef772f8a901986 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Feb 27 2007 23:38:43 +0000
Subject: - Fix scp with single quotes (#217178).

- Borrow fix for bzip2 w/spaces, and apropos and whatis support from
    Debian.

---

diff --git a/bash-completion-20060301-debian.patch b/bash-completion-20060301-debian.patch
new file mode 100644
index 0000000..1cfc478
--- /dev/null
+++ b/bash-completion-20060301-debian.patch
@@ -0,0 +1,20 @@
+--- 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]}
diff --git a/bash-completion-20060301-scp-apos-217178.patch b/bash-completion-20060301-scp-apos-217178.patch
new file mode 100644
index 0000000..e931bd8
--- /dev/null
+++ b/bash-completion-20060301-scp-apos-217178.patch
@@ -0,0 +1,18 @@
+--- 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
+ }
diff --git a/bash-completion.spec b/bash-completion.spec
index 896a93d..a1c8a84 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20060301
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -10,6 +10,8 @@ Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source2:        %{name}-mock
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
+Patch0:         %{name}-20060301-scp-apos-217178.patch
+Patch1:         %{name}-20060301-debian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,6 +24,8 @@ of the programmable completion feature of bash 2.
 
 %prep
 %setup -q -n bash_completion
+%patch0
+%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
@@ -96,6 +100,10 @@ fi\
 
 
 %changelog
+* 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.