rpms/gvfs/F-10 gvfs-bash-completion-fix-COMP_WORDBREAKS.patch, NONE, 1.1 gvfs-bash-completion-remove-shebang-and-executable.patch, NONE, 1.1 gvfs.spec, 1.100, 1.101

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17459

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-bash-completion-fix-COMP_WORDBREAKS.patch 
	gvfs-bash-completion-remove-shebang-and-executable.patch 
Log Message:
* Fri Jun 12 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-10
- Fix scp remote completion removes hostname (#444466)
- Move bash-completion out of profile.d (#466883)


gvfs-bash-completion-fix-COMP_WORDBREAKS.patch:

--- NEW FILE gvfs-bash-completion-fix-COMP_WORDBREAKS.patch ---
>From e71622dd0fc658fc3241b6bbf903fa3663ea0ebb Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Mon, 09 Mar 2009 16:18:52 +0000
Subject: Bug 523732 – gvfs-bash-completion.sh should not modify COMP_WORDBREAKS

2009-03-09  Alexander Larsson  <alexl at redhat.com>

	Bug 523732 – gvfs-bash-completion.sh should not modify COMP_WORDBREAKS

	* programs/gvfs-bash-completion.sh:
	Don't override COMP_WORDBREAKS, instead workaround the colon problem



svn path=/trunk/; revision=2307
---
diff --git a/programs/gvfs-bash-completion.sh b/programs/gvfs-bash-completion.sh
index 5ec524d..f5a3b9c 100755
--- a/programs/gvfs-bash-completion.sh
+++ b/programs/gvfs-bash-completion.sh
@@ -24,14 +24,26 @@
 
 ####################################################################################################
 
-# don't misbehave on colons; See item E13 at http://tiswww.case.edu/php/chet/bash/FAQ
-COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
 
 __gvfs_multiple_uris() {
     local IFS=$'\n'
     local cur="${COMP_WORDS[COMP_CWORD]}"
 
     COMPREPLY=($(compgen -W '$(gvfs-ls --show-completions "$cur")' -- ""))
+
+    # don't misbehave on colons; See item E13 at http://tiswww.case.edu/php/chet/bash/FAQ
+    # We handle this locally be extracting any BLAH: prefix and removing it from the result.
+    # Not great, but better than globally changing COMP_WORDBREAKS
+    
+    case "$cur" in
+	*:*)
+	    case "$COMP_WORDBREAKS" in
+		*:*) colon_prefix=$(echo $cur | sed 's/:[^:]*$/:/' )
+		    COMPREPLY=${COMPREPLY##${colon_prefix}}
+		    ;;
+	    esac
+	    ;;
+    esac
 }
 
 ####################################################################################################
--
cgit v0.8.2

gvfs-bash-completion-remove-shebang-and-executable.patch:

--- NEW FILE gvfs-bash-completion-remove-shebang-and-executable.patch ---
>From ced485ed5cf632e5f48f31546a4c731e8984729d Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl at redhat.com>
Date: Thu, 16 Apr 2009 09:38:04 +0000
Subject: Bug 523420 – gvfs-bash-completion.sh has a shebang and is executable

2009-04-16  Alexander Larsson  <alexl at redhat.com>

	Bug 523420 – gvfs-bash-completion.sh has a shebang and is executable
	
	* programs/Makefile.am:
	Don't install gvfs-bash-completion.sh as executable
	
	* programs/gvfs-bash-completion.sh:
	Remove shebang



svn path=/trunk/; revision=2376
---
diff --git a/programs/Makefile.am b/programs/Makefile.am
index 7f7d9dc..bde75e4 100644
--- a/programs/Makefile.am
+++ b/programs/Makefile.am
@@ -34,7 +34,7 @@ bin_SCRIPTS =					\
 
 if ENABLE_BASHCOMP
 profiledir = $(BASHCOMP_DIR)
-profile_SCRIPTS = gvfs-bash-completion.sh
+profile_DATA = gvfs-bash-completion.sh
 endif
 
 gvfs_cat_SOURCES = gvfs-cat.c
diff --git a/programs/gvfs-bash-completion.sh b/programs/gvfs-bash-completion.sh
index f5a3b9c..207b7d8 100755
--- a/programs/gvfs-bash-completion.sh
+++ b/programs/gvfs-bash-completion.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 # Copyright (C) 2006-2007 Red Hat, Inc.
 #
 # This library is free software; you can redistribute it and/or modify
--
cgit v0.8.2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-10/gvfs.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gvfs.spec	8 Jun 2009 15:43:19 -0000	1.100
+++ gvfs.spec	12 Jun 2009 14:39:05 -0000	1.101
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -74,6 +74,16 @@ Patch15: gvfs-1.2.3-ftp-filesize.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
 Patch16: gvfs-1.2.3-sftp-40sec-timeout.patch
 
+# gvfs-bash-completion.sh has a shebang and is executable
+# https://bugzilla.gnome.org/show_bug.cgi?id=523420
+# https://bugzilla.redhat.com/show_bug.cgi?id=466883
+Patch17: gvfs-bash-completion-remove-shebang-and-executable.patch
+
+# gvfs-bash-completion.sh should not modify COMP_WORDBREAKS
+# https://bugzilla.gnome.org/show_bug.cgi?id=523732
+# https://bugzilla.redhat.com/show_bug.cgi?id=444466
+Patch18: gvfs-bash-completion-fix-COMP_WORDBREAKS.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -170,6 +180,8 @@ popd
 %patch14 -p0 -b .sftp-cpu
 %patch15 -p1 -b .ftp-size
 %patch16 -p1 -b .sftp-timeout
+%patch17 -p1 -b .bash-shebang
+%patch18 -p1 -b .bash-wordbreaks
 
 
 %build
@@ -181,7 +193,7 @@ autoheader  || :
 automake  || :
 autoconf  || :
 
-%configure
+%configure --with-bash-completion-dir=%{_sysconfdir}/bash_completion.d/
 make # %{?_smp_mflags}
 
 %install
@@ -213,7 +225,7 @@ update-desktop-database &> /dev/null ||:
 %doc AUTHORS COPYING NEWS README
 %dir %{_datadir}/gvfs
 %dir %{_datadir}/gvfs/mounts
-%{_sysconfdir}/profile.d/gvfs-bash-completion.sh
+%{_sysconfdir}/bash_completion.d/gvfs-bash-completion.sh
 %{_datadir}/gvfs/mounts/sftp.mount
 %{_datadir}/gvfs/mounts/trash.mount
 %{_datadir}/gvfs/mounts/cdda.mount
@@ -308,6 +320,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Fri Jun 12 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-10
+- Fix scp remote completion removes hostname (#444466)
+- Move bash-completion out of profile.d (#466883)
+
 * Mon Jun  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-9
 - SFTP: Increase timeout (#504339)