rpms/bash-completion/devel bash-completion-1.2-init.d.patch, NONE, 1.1 bash-completion.spec, 1.51, 1.52

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25278/devel

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-1.2-init.d.patch 
Log Message:
* Mon Jun 28 2010 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2-2
- Apply upstream post 1.2 /etc/init.d/* completion improvements to fix #608351.


bash-completion-1.2-init.d.patch:
 service |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE bash-completion-1.2-init.d.patch ---
diff --git a/contrib/service b/contrib/service
index 9ebd117..6efd7c1 100644
--- a/contrib/service
+++ b/contrib/service
@@ -32,9 +32,11 @@ _service()
     return 0
 } &&
 complete -F _service service
-[ -d /etc/init.d/ ] && complete -F _service -o default \
-    $(for i in /etc/init.d/*; do
-    complete -p ${i##*/} &>/dev/null || printf '%s\n' ${i##*/}; done)
+for svc in /etc/init.d/*; do
+    [ ! -x "$svc" ] || complete -p "${svc##*/}" &>/dev/null || \
+        complete -F _service -o default "${svc##*/}"
+done
+unset svc
 
 # Local variables:
 # mode: shell-script


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- bash-completion.spec	18 Jun 2010 05:30:05 -0000	1.51
+++ bash-completion.spec	29 Jun 2010 16:41:39 -0000	1.52
@@ -3,7 +3,7 @@
 
 Name:           bash-completion
 Version:        1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -12,6 +12,8 @@ License:        GPLv2+
 URL:            http://bash-completion.alioth.debian.org/
 Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2
 Source1:        %{name}-plague-client
+# From upstream post-1.2 git
+Patch0:         %{name}-1.2-init.d.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +33,7 @@ of the programmable completion feature o
 
 %prep
 %setup -q
+%patch0 -p1
 install -pm 644 %{SOURCE1} contrib/plague-client
 
 # Updated completions shipped upstream:
@@ -346,6 +349,9 @@ fi
 
 
 %changelog
+* Mon Jun 28 2010 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2-2
+- Apply upstream post 1.2 /etc/init.d/* completion improvements to fix #608351.
+
 * Wed Jun 16 2010 Ville Skyttä <ville.skytta at iki.fi> - 1:1.2-1
 - Update to 1.2, all patches applied upstream.
 - Fixes #444469, #538433, #541423, and #601813, works around #585384.