[bash-completion] Update to 1.99.

[Ville Skyttä]

commit d1d1afae6d8805fe7e8dcb21794d09817589cd7b
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Jan 8 14:15:11 2012 +0200

    Update to 1.99.

 bash-completion-1.3-filedir.bash                   |   36 --------------------
 bash-completion-1.90-noblacklist.patch             |   21 -----------
 bash-completion-1.99-noblacklist.patch             |   12 ++++++
 ...h => bash-completion-1.99-redefine_filedir.bash |    8 +++--
 bash-completion-plague-client                      |   15 --------
 bash-completion.spec                               |   17 +++------
 sources                                            |    2 +-
 7 files changed, 24 insertions(+), 87 deletions(-)
---
diff --git a/bash-completion-1.99-noblacklist.patch b/bash-completion-1.99-noblacklist.patch
new file mode 100644
index 0000000..f3cd42e
--- /dev/null
+++ b/bash-completion-1.99-noblacklist.patch
@@ -0,0 +1,12 @@
+diff -up bash-completion-1.99/bash_completion~ bash-completion-1.99/bash_completion
+--- bash-completion-1.99/bash_completion~	2012-01-08 01:03:46.000000000 +0200
++++ bash-completion-1.99/bash_completion	2012-01-08 13:50:33.412012530 +0200
+@@ -45,7 +45,7 @@ readonly BASH_COMPLETION_COMPAT_DIR
+ 
+ # Blacklisted completions, causing problems with our code.
+ #
+-_blacklist_glob='@(acroread.sh)'
++_blacklist_glob='@()' 
+ 
+ # Turn on extended globbing and programmable completion
+ shopt -s extglob progcomp
diff --git a/bash-completion-1.90-redefine_filedir.bash b/bash-completion-1.99-redefine_filedir.bash
similarity index 88%
rename from bash-completion-1.90-redefine_filedir.bash
rename to bash-completion-1.99-redefine_filedir.bash
index 1361f87..f8c2a38 100644
--- a/bash-completion-1.90-redefine_filedir.bash
+++ b/bash-completion-1.99-redefine_filedir.bash
@@ -41,7 +41,9 @@ _filedir()
         -n "$1" && "$1" != -d && ${#toks[@]} -lt 1 ]] && \
         toks+=( $( compgen -f -- $quoted ) )
 
-    [ ${#toks[@]} -ne 0 ] && compopt -o filenames 2>/dev/null
-
-    COMPREPLY+=( "${toks[@]}" )
+    if [[ ${#toks[@]} -ne 0 ]]; then
+        # 2>/dev/null for direct invocation, e.g. in the _filedir unit test
+        compopt -o filenames 2>/dev/null
+        COMPREPLY+=( "${toks[@]}" )
+    fi
 } # _filedir()
diff --git a/bash-completion.spec b/bash-completion.spec
index a430f59..207eb18 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -2,7 +2,7 @@
 %bcond_with tests
 
 Name:           bash-completion
-Version:        1.90
+Version:        1.99
 Release:        1%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
@@ -10,13 +10,11 @@ Summary:        Programmable completion for Bash
 License:        GPLv2+
 URL:            http://bash-completion.alioth.debian.org/
 Source0:        http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2
-# In upstream post-1.90 git:
-Source1:        %{name}-plague-client
 Source2:        CHANGES.package.old
 # https://bugzilla.redhat.com/677446, see also noblacklist patch
-Source3:        %{name}-1.90-redefine_filedir.bash
+Source3:        %{name}-1.99-redefine_filedir.bash
 # https://bugzilla.redhat.com/677446, see also filedir source
-Patch0:         %{name}-1.90-noblacklist.patch
+Patch0:         %{name}-1.99-noblacklist.patch
 
 BuildArch:      noarch
 %if %{with tests}
@@ -44,8 +42,6 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-install -pm 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/plague-client
 
 # Updated completion shipped in cowsay package:
 rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/{cowsay,cowthink}
@@ -53,10 +49,6 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/{cowsay,cowthink}
 install -Dpm 644 %{SOURCE3} \
     $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/redefine_filedir
 
-# Fixed in upstream post-1.90 git:
-chmod -c 644 $RPM_BUILD_ROOT%{_datadir}/bash-completion/bash_completion
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-
 
 %if %{with tests}
 %check
@@ -82,6 +74,9 @@ exit $result
 
 
 %changelog
+* Sun Jan  8 2012 Ville Skyttä <ville.skytta at iki.fi> - 1:1.99-1
+- Update to 1.99.
+
 * Fri Nov  4 2011 Ville Skyttä <ville.skytta at iki.fi> - 1:1.90-1
 - Update to 1.90.
 - Specfile cleanups.
diff --git a/sources b/sources
index 359481a..06f75e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 26caffcd8a2ed8a8aaec3cca13d9bf0a  CHANGES.package.old
-82635839d83074eba923822fd584490c  bash-completion-1.90.tar.bz2
+3cf478b7f1065f424d3d6ec35f80e4f2  bash-completion-1.99.tar.bz2