rpms/bash-completion/FC-2 bash-completion.profile, 1.1, 1.2 bash-completion.spec, 1.2, 1.3

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/bash-completion/FC-2
In directory cvs.fedora.redhat.com:/tmp/cvs-serv21203/FC-2

Modified Files:
	bash-completion.profile bash-completion.spec 
Log Message:
Sync with fedora.us 0.0-0.fdr.4.20041017.


Index: bash-completion.profile
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-2/bash-completion.profile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-completion.profile	8 Nov 2004 04:04:55 -0000	1.1
+++ bash-completion.profile	27 Nov 2004 15:43:28 -0000	1.2
@@ -3,7 +3,8 @@
 
 # check for correct version of bash
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ $bmajor -eq 2 ] && [ $bminor '>' 04 ] && [ -r /etc/bash_completion ]; then
+if [ -r /etc/bash_completion ] && \
+   [ $bmajor -eq 2 -a $bminor '>' 04 -o $bmajor -gt 2 ] ; then
     # source completion code
     . /etc/bash_completion
 fi


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-2/bash-completion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion.spec	8 Nov 2004 04:05:13 -0000	1.2
+++ bash-completion.spec	27 Nov 2004 15:43:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        0.0
-Release:        0.fdr.3.20041017
+Release:        0.fdr.4.20041017
 Epoch:          0
 Summary:        Programmable completion for Bash
 
@@ -128,6 +128,10 @@
 
 
 %changelog
+* Sat Nov  6 2004 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.4.20041017
+- Do the right thing with bash >= 3 too in profile.d snippet (bug 2228, thanks
+  to Thorsten Leemhuis).
+
 * Mon Oct 18 2004 Ville Skyttä <ville.skytta at iki.fi> 0:0.0-0.fdr.3.20041017
 - Update to 20041017, adds dhclient, lvm, and bittorrent completion.