From 6c1548a4c47ae67689c301facf0a6ca1d7dc84a0 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <ville.skytta@iki.fi>
Date: Nov 04 2011 22:14:55 +0000
Subject: Update to 1.90.

Specfile cleanups.
Move pre-1.2 %changelog entries to CHANGES.package.old.

---

diff --git a/.gitignore b/.gitignore
index e0ef701..fc12c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
+/*.tar.*
 /CHANGES.package.old
-/bash-completion-1.3.tar.bz2
diff --git a/bash-completion-1.3-gendiff.patch b/bash-completion-1.3-gendiff.patch
deleted file mode 100644
index 8a898de..0000000
--- a/bash-completion-1.3-gendiff.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit d066ace4cbca7f5da611f0fee2497e24e9d84f67
-Author: Ville Skyttä <ville.skytta@iki.fi>
-Date:   Mon Feb 7 20:59:01 2011 +0200
-
-    Do file completion after gendiff output redirection.
-    
-    Common use case is "gendiff DIR EXTENSION > FILE".
-
-diff --git a/completions/rpm b/completions/rpm
-index bbab036..5838365 100644
---- a/completions/rpm
-+++ b/completions/rpm
-@@ -294,9 +294,13 @@ have gendiff &&
- _gendiff()
- {
-     COMPREPLY=()
--    local cur cword
--    _get_comp_words_by_ref cur cword
--    [[ $cword != 1 ]] || _filedir -d
-+    local cur prev cword
-+    _get_comp_words_by_ref cur prev cword
-+    if [[ $cword -eq 1 ]]; then
-+        _filedir -d
-+    elif [[ $prev == *\> ]]; then
-+        _filedir
-+    fi
- } &&
- complete -F _gendiff gendiff
- 
diff --git a/bash-completion-1.3-helpersdir.patch b/bash-completion-1.3-helpersdir.patch
deleted file mode 100644
index fbd12bf..0000000
--- a/bash-completion-1.3-helpersdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up bash-completion-1.3/completions/perl~ bash-completion-1.3/completions/perl
---- bash-completion-1.3/completions/perl~	2011-01-21 11:36:11.000000000 +0200
-+++ bash-completion-1.3/completions/perl	2011-02-07 21:24:10.050008940 +0200
-@@ -4,13 +4,13 @@ have perl &&
- {
- _perlmodules()
- {
--    COMPREPLY=( $( compgen -P "$prefix" -W "$( $1 ${BASH_SOURCE[0]%/*}/helpers/perl modules $cur )" -- "$cur" ) )
-+    COMPREPLY=( $( compgen -P "$prefix" -W "$( $1 $(dirname $(readlink -f ${BASH_SOURCE[0]}))/helpers/perl modules $cur )" -- "$cur" ) )
-     __ltrim_colon_completions "$prefix$cur"
- }
- 
- _perlfunctions()
- {
--    COMPREPLY=( $( compgen -P "$prefix" -W "$( ${BASH_SOURCE[0]%/*}/helpers/perl functions $cur )" -- "$cur" ) )
-+    COMPREPLY=( $( compgen -P "$prefix" -W "$( $(dirname $(readlink -f ${BASH_SOURCE[0]}))/helpers/perl functions $cur )" -- "$cur" ) )
- }
- 
- _perl()
diff --git a/bash-completion-1.3-latexdbj-678122.patch b/bash-completion-1.3-latexdbj-678122.patch
deleted file mode 100644
index a7ca11f..0000000
--- a/bash-completion-1.3-latexdbj-678122.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 2eb713ff764b8a3d4baf2c1353d5474d5c3c74ed
-Author: Ted Pavlic <ted@tedpavlic.com>
-Date:   Fri Apr 15 23:47:04 2011 +0300
-
-    Add *.dbj to (la)tex filename completions (RedHat: #678122).
-
-diff --git a/bash_completion b/bash_completion
-index 9d1e7ee..0062535 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -90,7 +90,7 @@ complete -f -X '!*.@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|
- complete -f -X '!*.@(okular|@(?(e|x)ps|?(E|X)PS|pdf|PDF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM|fdf|FDF)?(.?(gz|GZ|bz2|BZ2)))' okular
- complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
- complete -f -X '!*.texi*' makeinfo texi2html
--complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
-+complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
- complete -f -X '!*.mp3' mpg123 mpg321 madplay
- complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine
- complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.part)' kaffeine dragon
diff --git a/bash-completion-1.3-libreoffice-692548.patch b/bash-completion-1.3-libreoffice-692548.patch
deleted file mode 100644
index 71cdd6d..0000000
--- a/bash-completion-1.3-libreoffice-692548.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit e10848b7e5613cf07d00f05d0bcafdc0625042ff
-Author: Matej Cepl <mcepl@redhat.com>
-Date:   Thu Mar 31 22:45:21 2011 +0300
-
-    Complete oo{writer,impress,calc,draw} on LibreOffice FlatXML extensions (RedHat: #692548).
-
-diff --git a/bash_completion b/bash_completion
-index 97da0e4..2b05b80 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -108,10 +108,10 @@ complete -f -X '!*.@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR])' wine
- complete -f -X '!*.@(zip|z|gz|tgz)' bzme
- # konqueror not here on purpose, it's more than a web/html browser
- complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon dillo elinks amaya firefox mozilla-firefox iceweasel google-chrome chromium-browser epiphany
--complete -f -X '!*.@(sxw|stw|sxg|sgl|doc?([mx])|dot?([mx])|rtf|txt|htm|html|odt|ott|odm)' oowriter
--complete -f -X '!*.@(sxi|sti|pps?(x)|ppt?([mx])|pot?([mx])|odp|otp)' ooimpress
--complete -f -X '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|[ct]sv|ods|ots)' oocalc
--complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw
-+complete -f -X '!*.@(sxw|stw|sxg|sgl|doc?([mx])|dot?([mx])|rtf|txt|htm|html|?(f)odt|ott|odm)' oowriter
-+complete -f -X '!*.@(sxi|sti|pps?(x)|ppt?([mx])|pot?([mx])|?(f)odp|otp)' ooimpress
-+complete -f -X '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|[ct]sv|?(f)ods|ots)' oocalc
-+complete -f -X '!*.@(sxd|std|sda|sdd|?(f)odg|otg)' oodraw
- complete -f -X '!*.@(sxm|smf|mml|odf)' oomath
- complete -f -X '!*.odb' oobase
- complete -f -X '!*.[rs]pm' rpm2cpio
diff --git a/bash-completion-1.3-manpager-689180.patch b/bash-completion-1.3-manpager-689180.patch
deleted file mode 100644
index 00cbe9e..0000000
--- a/bash-completion-1.3-manpager-689180.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up bash-completion-1.3/completions/perl~ bash-completion-1.3/completions/perl
---- bash-completion-1.3/completions/perl~	2011-01-21 11:36:11.000000000 +0200
-+++ bash-completion-1.3/completions/perl	2011-04-15 23:32:36.110480132 +0300
-@@ -112,7 +112,7 @@ _perldoc()
-         if [[ "$cur" != */* ]]; then
-             _perlmodules
-             COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
--                '$( PAGER=/bin/cat man perl |  \
-+                '$( MANPAGER=/bin/cat PAGER=/bin/cat man perl |  \
-                 sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
-                 awk "\$NF=2 { print \$1}" | command grep perl )' -- "$cur" ) )
-         fi
diff --git a/bash-completion-1.3-profile-hook.patch b/bash-completion-1.3-profile-hook.patch
deleted file mode 100644
index 28a77fd..0000000
--- a/bash-completion-1.3-profile-hook.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up bash-completion-1.3/bash_completion.sh.in~ bash-completion-1.3/bash_completion.sh.in
---- bash-completion-1.3/bash_completion.sh.in~	2011-01-21 11:36:11.000000000 +0200
-+++ bash-completion-1.3/bash_completion.sh.in	2011-09-05 00:08:06.654679539 +0300
-@@ -4,6 +4,8 @@
- # Check for recent enough version of bash.
- bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
- if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then
-+    [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] && \
-+        . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
-     if shopt -q progcomp && [ -r @sysconfdir@/bash_completion ]; then
-         # Source completion code.
-         . @sysconfdir@/bash_completion
-diff -up bash-completion-1.3/README~ bash-completion-1.3/README
---- bash-completion-1.3/README~	2011-01-21 11:36:11.000000000 +0200
-+++ bash-completion-1.3/README	2011-09-05 00:07:50.822210890 +0300
-@@ -30,6 +30,14 @@ mechanism, i.e. does not automatically s
- can source the $sysconfdir/profile.d/bash_completion.sh script in
- /etc/bashrc or ~/.bashrc.
- 
-+The profile.d script provides a configuration file hook that can be
-+used to prevent loading bash_completion on per user basis when it's
-+installed system wide.  To do this, turn off programmable completion
-+with "shopt -u progcomp" in $XDG_CONFIG_HOME/bash_completion
-+(~/.config/bash_completion if $XDG_CONFIG_HOME is not set), and turn
-+it back on for example in ~/.bashrc if you want to use programmable
-+completion for other purposes.
-+
- If you're using MacOS X, /etc/bashrc is apparently not sourced at all.
- In that case, you should put the bash_completion file in /sw/etc and add
- the following code to ~/.bash_profile:
diff --git a/bash-completion-1.3-selfparse-479936.patch b/bash-completion-1.3-selfparse-479936.patch
deleted file mode 100644
index 9c46e30..0000000
--- a/bash-completion-1.3-selfparse-479936.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff -up bash-completion-1.3/bash_completion~ bash-completion-1.3/bash_completion
---- bash-completion-1.3/bash_completion~	2011-08-15 22:31:12.425983498 +0300
-+++ bash-completion-1.3/bash_completion	2011-08-15 22:39:37.107327165 +0300
-@@ -64,68 +64,6 @@ shopt -s extglob progcomp
- # Make directory commands see only directories
- complete -d pushd
- 
--# The following section lists completions that are redefined later
--# Do NOT break these over multiple lines.
--#
--# START exclude -- do NOT remove this line
--# bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
--complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat
--complete -f -X '!*.@(zip|[ejw]ar|exe|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub|apk)' unzip zipinfo
--complete -f -X '*.Z' compress znew
--# zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
--complete -f -X '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat unpigz
--complete -f -X '!*.Z' uncompress
--# lzcmp, lzdiff intentionally not here, see Debian: #455510
--complete -f -X '!*.@(tlz|lzma)' lzcat lzegrep lzfgrep lzgrep lzless lzmore unlzma
--complete -f -X '!*.@(?(t)xz|tlz|lzma)' unxz xzcat
--complete -f -X '!*.lrz' lrunzip
--complete -f -X '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx)' ee
--complete -f -X '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits|pm)' xv qiv
--complete -f -X '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
--complete -f -X '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
--complete -f -X '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
--complete -f -X '!*.[pf]df' acroread gpdf xpdf
--complete -f -X '!*.@(?(e)ps|pdf)' kpdf
--complete -f -X '!*.@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|fdf)' evince
--complete -f -X '!*.@(okular|@(?(e|x)ps|?(E|X)PS|pdf|PDF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM|fdf|FDF)?(.?(gz|GZ|bz2|BZ2)))' okular
--complete -f -X '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
--complete -f -X '!*.texi*' makeinfo texi2html
--complete -f -X '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
--complete -f -X '!*.mp3' mpg123 mpg321 madplay
--complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine
--complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.part)' kaffeine dragon
--complete -f -X '!*.@(avi|asf|wmv)' aviplay
--complete -f -X '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
--complete -f -X '!*.@(mpg|mpeg|avi|mov|qt)' xanim
--complete -f -X '!*.@(ogg|m3u|flac|spx)' ogg123
--complete -f -X '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
--complete -f -X '!*.fig' xfig
--complete -f -X '!*.@(mid?(i)|cmf)' playmidi
--complete -f -X '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
--complete -f -X '!*.@(m[eo]d|s[3t]m|xm|it)' modplugplay modplug123
--complete -f -X '*.@(o|so|so.!(conf)|a|[rs]pm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
--complete -f -X '!*.@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR])' wine
--complete -f -X '!*.@(zip|z|gz|tgz)' bzme
--# konqueror not here on purpose, it's more than a web/html browser
--complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon dillo elinks amaya firefox mozilla-firefox iceweasel google-chrome chromium-browser epiphany
--complete -f -X '!*.@(sxw|stw|sxg|sgl|doc?([mx])|dot?([mx])|rtf|txt|htm|html|?(f)odt|ott|odm)' oowriter
--complete -f -X '!*.@(sxi|sti|pps?(x)|ppt?([mx])|pot?([mx])|?(f)odp|otp)' ooimpress
--complete -f -X '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|[ct]sv|?(f)ods|ots)' oocalc
--complete -f -X '!*.@(sxd|std|sda|sdd|?(f)odg|otg)' oodraw
--complete -f -X '!*.@(sxm|smf|mml|odf)' oomath
--complete -f -X '!*.odb' oobase
--complete -f -X '!*.[rs]pm' rpm2cpio
--complete -f -X '!*.aux' bibtex
--complete -f -X '!*.po' poedit gtranslator kbabel lokalize
--complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
--complete -f -X '!*.[Hh][Rr][Bb]' hbrun
--complete -f -X '!*.ly' lilypond ly2dvi
--complete -f -X '!*.@(dif?(f)|?(d)patch)?(.@([gx]z|bz2|lzma))' cdiff
--complete -f -X '!*.lyx' lyx
--complete -f -X '!@(*.@(ks|jks|jceks|p12|pfx|bks|ubr|gkr|cer|crt|cert|p7b|pkipath|pem|p10|csr|crl)|cacerts)' portecle
--complete -f -X '!*.@(mp[234c]|og[ag]|@(fl|a)ac|m4[abp]|spx|tta|w?(a)v|wma|aif?(f)|asf|ape)' kid3 kid3-qt
--# FINISH exclude -- do not remove this line
--
- # start of section containing compspecs that can be handled within bash
- 
- # user commands see only users
-@@ -1582,25 +1520,17 @@ for i in a2ps awk bash bc bison cat colo
- done
- unset i
- 
-+declare -A _xspecs
- _filedir_xspec()
- {
--    local IFS cur xspec
--
--    IFS=$'\n'
-+    local cur
-     COMPREPLY=()
-     _get_comp_words_by_ref cur
- 
-     _expand || return 0
- 
--    # get first exclusion compspec that matches this command
--    xspec=$( awk "/^complete[ \t]+.*[ \t]${1##*/}([ \t]|\$)/ { print \$0; exit }" \
--        "$BASH_COMPLETION" )
--    # prune to leave nothing but the -X spec
--    xspec=${xspec#*-X }
--    xspec=${xspec%% *}
--
-+    local IFS=$'\n' xspec=${_xspecs[${1##*/}]} tmp
-     local -a toks
--    local tmp
- 
-     toks=( ${toks[@]-} $(
-         compgen -d -- "$(quote_readline "$cur")" | {
-@@ -1633,28 +1563,73 @@ _filedir_xspec()
-     [ ${#toks[@]} -ne 0 ] && _compopt_o_filenames
-     COMPREPLY=( "${toks[@]}" )
- }
--list=( $( sed -ne '/^# START exclude/,/^# FINISH exclude/p' "$BASH_COMPLETION" | \
--    # read exclusion compspecs
--    (
--    while read line
--    do
--        # ignore compspecs that are commented out
--        if [ "${line#\#}" != "$line" ]; then continue; fi
--        line=${line%# START exclude*}
--        line=${line%# FINISH exclude*}
--        line=${line##*\'}
--        list=( "${list[@]}" $line )
-+
-+_install_xspec()
-+{
-+    local xspec=$1 cmd
-+    shift
-+    for cmd in $@; do
-+        _xspecs[$cmd]=$xspec
-     done
--    printf '%s ' "${list[@]}"
--    )
--    ) )
--# remove previous compspecs
--if [ ${#list[@]} -gt 0 ]; then
--    eval complete -r ${list[@]}
--    # install new compspecs
--    eval complete -F _filedir_xspec "${list[@]}"
--fi
--unset list
-+    complete -F _filedir_xspec $@
-+}
-+# bzcmp, bzdiff, bz*grep, bzless, bzmore intentionally not here, see Debian: #455510
-+_install_xspec '!*.?(t)bz?(2)' bunzip2 bzcat pbunzip2 pbzcat
-+_install_xspec '!*.@(zip|[ejw]ar|exe|pk3|wsz|zargo|xpi|sxw|o[tx]t|od[fgpst]|epub|apk)' unzip zipinfo
-+_install_xspec '*.Z' compress znew
-+# zcmp, zdiff, z*grep, zless, zmore intentionally not here, see Debian: #455510
-+_install_xspec '!*.@(Z|[gGd]z|t[ag]z)' gunzip zcat unpigz
-+_install_xspec '!*.Z' uncompress
-+# lzcmp, lzdiff intentionally not here, see Debian: #455510
-+_install_xspec '!*.@(tlz|lzma)' lzcat lzegrep lzfgrep lzgrep lzless lzmore unlzma
-+_install_xspec '!*.@(?(t)xz|tlz|lzma)' unxz xzcat
-+_install_xspec '!*.lrz' lrunzip
-+_install_xspec '!*.@(gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx)' ee
-+_install_xspec '!*.@(gif|jp?(e)g|tif?(f)|png|p[bgp]m|bmp|x[bp]m|rle|rgb|pcx|fits|pm)' xv qiv
-+_install_xspec '!*.@(@(?(e)ps|?(E)PS|pdf|PDF)?(.gz|.GZ|.bz2|.BZ2|.Z))' gv ggv kghostview
-+_install_xspec '!*.@(dvi|DVI)?(.@(gz|Z|bz2))' xdvi kdvi
-+_install_xspec '!*.dvi' dvips dviselect dvitype dvipdf advi dvipdfm dvipdfmx
-+_install_xspec '!*.[pf]df' acroread gpdf xpdf
-+_install_xspec '!*.@(?(e)ps|pdf)' kpdf
-+_install_xspec '!*.@(@(?(e)ps|?(E)PS|[pf]df|[PF]DF|dvi|DVI)?(.gz|.GZ|.bz2|.BZ2)|cb[rz]|djv?(u)|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|fdf)' evince
-+_install_xspec '!*.@(okular|@(?(e|x)ps|?(E|X)PS|pdf|PDF|dvi|DVI|cb[rz]|CB[RZ]|djv?(u)|DJV?(U)|dvi|DVI|gif|jp?(e)g|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX|epub|EPUB|odt|ODT|fb?(2)|FB?(2)|mobi|MOBI|g3|G3|chm|CHM|fdf|FDF)?(.?(gz|GZ|bz2|BZ2)))' okular
-+_install_xspec '!*.@(?(e)ps|pdf)' ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr
-+_install_xspec '!*.texi*' makeinfo texi2html
-+_install_xspec '!*.@(?(la)tex|texi|dtx|ins|ltx|dbj)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi
-+_install_xspec '!*.mp3' mpg123 mpg321 madplay
-+_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM)|+([0-9]).@(vdr|VDR))?(.part)' xine aaxine fbxine
-+_install_xspec '!*@(.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|divx|DIVX|vcd|ps|pes|fli|flv|FLV|fxm|FXM|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp[234]|MP[234]|m4[pv]|M4[PV]|mkv|MKV|og[gmv]|OG[GMV]|t[ps]|T[PS]|m2t?(s)|M2T?(S)|wav|WAV|flac|FLAC|asx|ASX|mng|MNG|srt|m[eo]d|M[EO]D|s[3t]m|S[3T]M|it|IT|xm|XM|iso|ISO)|+([0-9]).@(vdr|VDR))?(.part)' kaffeine dragon
-+_install_xspec '!*.@(avi|asf|wmv)' aviplay
-+_install_xspec '!*.@(rm?(j)|ra?(m)|smi?(l))' realplay
-+_install_xspec '!*.@(mpg|mpeg|avi|mov|qt)' xanim
-+_install_xspec '!*.@(ogg|m3u|flac|spx)' ogg123
-+_install_xspec '!*.@(mp3|ogg|pls|m3u)' gqmpeg freeamp
-+_install_xspec '!*.fig' xfig
-+_install_xspec '!*.@(mid?(i)|cmf)' playmidi
-+_install_xspec '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
-+_install_xspec '!*.@(m[eo]d|s[3t]m|xm|it)' modplugplay modplug123
-+_install_xspec '*.@(o|so|so.!(conf)|a|[rs]pm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
-+_install_xspec '!*.@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR])' wine
-+_install_xspec '!*.@(zip|z|gz|tgz)' bzme
-+# konqueror not here on purpose, it's more than a web/html browser
-+_install_xspec '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon dillo elinks amaya firefox mozilla-firefox iceweasel google-chrome chromium-browser epiphany
-+_install_xspec '!*.@(sxw|stw|sxg|sgl|doc?([mx])|dot?([mx])|rtf|txt|htm|html|?(f)odt|ott|odm)' oowriter
-+_install_xspec '!*.@(sxi|sti|pps?(x)|ppt?([mx])|pot?([mx])|?(f)odp|otp)' ooimpress
-+_install_xspec '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|[ct]sv|?(f)ods|ots)' oocalc
-+_install_xspec '!*.@(sxd|std|sda|sdd|?(f)odg|otg)' oodraw
-+_install_xspec '!*.@(sxm|smf|mml|odf)' oomath
-+_install_xspec '!*.odb' oobase
-+_install_xspec '!*.[rs]pm' rpm2cpio
-+_install_xspec '!*.aux' bibtex
-+_install_xspec '!*.po' poedit gtranslator kbabel lokalize
-+_install_xspec '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
-+_install_xspec '!*.[Hh][Rr][Bb]' hbrun
-+_install_xspec '!*.ly' lilypond ly2dvi
-+_install_xspec '!*.@(dif?(f)|?(d)patch)?(.@([gx]z|bz2|lzma))' cdiff
-+_install_xspec '!*.lyx' lyx
-+_install_xspec '!@(*.@(ks|jks|jceks|p12|pfx|bks|ubr|gkr|cer|crt|cert|p7b|pkipath|pem|p10|csr|crl)|cacerts)' portecle
-+_install_xspec '!*.@(mp[234c]|og[ag]|@(fl|a)ac|m4[abp]|spx|tta|w?(a)v|wma|aif?(f)|asf|ape)' kid3 kid3-qt
-+unset -f _install_xspec
- 
- # source completion directory definitions
- if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
diff --git a/bash-completion-1.3-sum-717341.patch b/bash-completion-1.3-sum-717341.patch
deleted file mode 100644
index ba42db2..0000000
--- a/bash-completion-1.3-sum-717341.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e7b3abf689e9608aa60e6a4504df136022987633 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Wed, 29 Jun 2011 00:22:54 +0300
-Subject: [PATCH] sum: New (generic long option) completion (RedHat: #717341).
-
----
- bash_completion |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bash_completion b/bash_completion
-index e5577e3..eae72eb 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -1696,7 +1696,7 @@ for i in a2ps awk bash bc bison cat colordiff cp csplit \
-     curl cut date df diff dir du enscript env expand fmt fold gperf gprof \
-     grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
-     mv netstat nl nm objcopy objdump od paste patch pr ptx readelf rm rmdir \
--    sed seq sha{,1,224,256,384,512}sum shar sort split strip tac tail tee \
-+    sed seq sha{,1,224,256,384,512}sum shar sort split strip sum tac tail tee \
-     texindex touch tr uname unexpand uniq units vdir wc wget who; do
-     have $i && complete -F _longopt -o default $i
- done
--- 
-1.7.2.5
-
diff --git a/bash-completion-1.3-xspec-726220.patch b/bash-completion-1.3-xspec-726220.patch
deleted file mode 100644
index 6526e7e..0000000
--- a/bash-completion-1.3-xspec-726220.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 75309e9f254ee4e5e31e85e18c782e64707a6d22 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
-Date: Mon, 15 Aug 2011 21:55:19 +0300
-Subject: [PATCH] _filedir_xspec: Don't expand $xspec while uppercasing on bash-3 (RedHat: #726220).
-
----
- bash_completion |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bash_completion b/bash_completion
-index 6601937..1844e81 100644
---- a/bash_completion
-+++ b/bash_completion
-@@ -1616,7 +1616,7 @@ _filedir_xspec()
-     fi
-     [[ ${BASH_VERSINFO[0]} -ge 4 ]] && \
-         xspec="$matchop($xspec|${xspec^^})" || \
--        xspec="$matchop($xspec|$(printf %s $xspec | tr '[:lower:]' '[:upper:]'))"
-+        xspec="$matchop($xspec|$(tr '[:lower:]' '[:upper:]' <<<$xspec))"
- 
-     toks=( ${toks[@]-} $(
-         eval compgen -f -X "!$xspec" -- "\$(quote_readline "\$cur")" | {
--- 
-1.7.2.5
-
diff --git a/bash-completion-1.3-yeswehave.patch b/bash-completion-1.3-yeswehave.patch
deleted file mode 100644
index 9b77c09..0000000
--- a/bash-completion-1.3-yeswehave.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up bash-completion-1.3/bash_completion.orig bash-completion-1.3/bash_completion
---- bash-completion-1.3/bash_completion.orig	2011-02-06 21:16:00.000000000 +0200
-+++ bash-completion-1.3/bash_completion	2011-08-15 12:52:42.040790631 +0300
-@@ -171,7 +171,11 @@ have()
-     unset -v have
-     # Completions for system administrator commands are installed as well in
-     # case completion is attempted via `sudo command ...'.
--    PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type $1 &>/dev/null &&
-+    # In this packaged setup we don't need to do the availability test below
-+    # because only completions for commands that are actually available should
-+    # be in /etc/bash_completion.d anyway; not doing the test improves our load
-+    # time significantly.
-+    #PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type $1 &>/dev/null &&
-     have="yes"
- }
- 
-diff -up bash-completion-1.3/completions/ant.orig bash-completion-1.3/completions/ant
---- bash-completion-1.3/completions/ant.orig	2011-01-21 11:36:11.000000000 +0200
-+++ bash-completion-1.3/completions/ant	2011-08-15 12:54:52.717060687 +0300
-@@ -57,7 +57,8 @@ _ant()
-             -- "$cur" ) )
-         fi
- }
--have complete-ant-cmd.pl && \
-+# https://bugzilla.redhat.com/729771
-+PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin type complete-ant-cmd.pl &>/dev/null && \
-      complete -C complete-ant-cmd.pl -F _ant ant || complete -F _ant ant
- }
- 
diff --git a/bash-completion-1.90-noblacklist.patch b/bash-completion-1.90-noblacklist.patch
new file mode 100644
index 0000000..769c8f8
--- /dev/null
+++ b/bash-completion-1.90-noblacklist.patch
@@ -0,0 +1,21 @@
+diff -up bash-completion-1.90/bash_completion~ bash-completion-1.90/bash_completion
+--- bash-completion-1.90/bash_completion~	2011-11-03 11:51:35.000000000 +0200
++++ bash-completion-1.90/bash_completion	2011-11-04 21:34:14.073711442 +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
+@@ -1878,7 +1878,7 @@ if [[ -d $BASH_COMPLETION_COMPAT_DIR && 
+             && -f $i && -r $i ]] && . "$i"
+     done
+ fi
+-unset i
++unset i _blacklist_glob
+ 
+ # source user completion file
+ [[ ${BASH_SOURCE[0]} != ~/.bash_completion && -r ~/.bash_completion ]] \
diff --git a/bash-completion-1.90-redefine_filedir.bash b/bash-completion-1.90-redefine_filedir.bash
new file mode 100644
index 0000000..1361f87
--- /dev/null
+++ b/bash-completion-1.90-redefine_filedir.bash
@@ -0,0 +1,47 @@
+# This is a copy of the _filedir function in bash_completion, included
+# and (re)defined separately here because some versions of Adobe
+# Reader, if installed, are known to override this function with an
+# incompatible version, causing various problems.
+#
+# https://bugzilla.redhat.com/677446
+# http://forums.adobe.com/thread/745833
+
+_filedir()
+{
+    local i IFS=$'\n' xspec
+
+    _tilde "$cur" || return 0
+
+    local -a toks
+    local quoted tmp
+
+    _quote_readline_by_ref "$cur" quoted
+    toks=( $(
+        compgen -d -- "$quoted" | {
+            while read -r tmp; do
+                # TODO: I have removed a "[ -n $tmp ] &&" before 'printf ..',
+                #       and everything works again. If this bug suddenly
+                #       appears again (i.e. "cd /b<TAB>" becomes "cd /"),
+                #       remember to check for other similar conditionals (here
+                #       and _filedir_xspec()). --David
+                printf '%s\n' $tmp
+            done
+        }
+    ))
+
+    if [[ "$1" != -d ]]; then
+        # Munge xspec to contain uppercase version too
+        # http://thread.gmane.org/gmane.comp.shells.bash.bugs/15294/focus=15306
+        xspec=${1:+"!*.@($1|${1^^})"}
+        toks+=( $( compgen -f -X "$xspec" -- $quoted ) )
+    fi
+
+    # If the filter failed to produce anything, try without it if configured to
+    [[ -n ${COMP_FILEDIR_FALLBACK:-} && \
+        -n "$1" && "$1" != -d && ${#toks[@]} -lt 1 ]] && \
+        toks+=( $( compgen -f -- $quoted ) )
+
+    [ ${#toks[@]} -ne 0 ] && compopt -o filenames 2>/dev/null
+
+    COMPREPLY+=( "${toks[@]}" )
+} # _filedir()
diff --git a/bash-completion-plague-client b/bash-completion-plague-client
index a1eafb5..503ceda 100644
--- a/bash-completion-plague-client
+++ b/bash-completion-plague-client
@@ -1,20 +1,15 @@
-# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# -*- mode: shell-script; sh-basic-offset: 4; indent-tabs-mode: nil -*-
 # ex: ts=8 sw=8 noet filetype=sh
 
 # bash completion for plague-client
 
 _plague_client()
 {
-	local cur
+    local cur prev words cword
+    _init_completion || return
 
-	COMPREPLY=()
-	_get_comp_words_by_ref cur
-
-	[ $COMP_CWORD = 1 ] && \
-		COMPREPLY=( $( compgen -W 'build detail finish help is_paused \
-				kill list list_builders pause requeue unpause \
-				update_builders' -- $cur ) )
-
-	return 0
+    [[ $cword -eq 1 ]] && \
+        COMPREPLY=( $( compgen -W 'build detail finish help is_paused kill list
+            list_builders pause requeue unpause update_builders' -- "$cur" ) )
 } &&
 complete -F _plague_client plague-client
diff --git a/bash-completion.spec b/bash-completion.spec
index 9584003..a430f59 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -2,40 +2,21 @@
 %bcond_with tests
 
 Name:           bash-completion
-Version:        1.3
-Release:        6%{?dist}
+Version:        1.90
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
-Group:          System Environment/Shells
 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
-Source3:        %{name}-1.3-filedir.bash
-# Non-upstream: adjust helpers dir location to our modified layout
-Patch0:         %{name}-1.3-helpersdir.patch
-# Non-upstream: see comments in patch
-Patch1:         %{name}-1.3-yeswehave.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=d066ace
-Patch2:         %{name}-1.3-gendiff.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=f1b9580
-Patch3:         %{name}-1.3-manpager-689180.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=e10848b
-Patch4:         %{name}-1.3-libreoffice-692548.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=2eb713f
-Patch5:         %{name}-1.3-latexdbj-678122.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=75309e9
-Patch6:         %{name}-1.3-xspec-726220.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=d74e169
-Patch7:         %{name}-1.3-selfparse-479936.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=e7b3abf
-Patch8:         %{name}-1.3-sum-717341.patch
-# http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=525d6e7
-Patch9:         bash-completion-1.3-profile-hook.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# https://bugzilla.redhat.com/677446, see also noblacklist patch
+Source3:        %{name}-1.90-redefine_filedir.bash
+# https://bugzilla.redhat.com/677446, see also filedir source
+Patch0:         %{name}-1.90-noblacklist.patch
 
 BuildArch:      noarch
 %if %{with tests}
@@ -43,14 +24,7 @@ BuildRequires:  dejagnu
 BuildRequires:  screen
 BuildRequires:  tcllib
 %endif
-%if 0%{?fedora} || 0%{?rhel} > 5
-# For Patch7
-Requires:       bash >= 4
-%else
-Requires:       bash >= 3.2
-%endif
-# For symlinking in triggers, #490768
-Requires:       coreutils
+Requires:       bash >= 4.1
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -60,18 +34,6 @@ of the programmable completion feature of bash.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%if 0%{?fedora} || 0%{?rhel} > 5
-# bash >= 4 only
-%patch7 -p1
-%endif
-%patch8 -p1
-%patch9 -p1
 install -pm 644 %{SOURCE2} .
 
 
@@ -81,77 +43,19 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT %{name}-files.list
 make install DESTDIR=$RPM_BUILD_ROOT
+install -pm 644 %{SOURCE1} \
+    $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/plague-client
 
-cd $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-
-# Updated completions shipped upstream:
-rm cowsay
-
-# Combine to per-package files to work around #585384:
-( echo ; cat update-alternatives ) >> chkconfig
-rm update-alternatives
-( echo ; cat sysctl ) >> procps
-rm sysctl
-( echo ; cat chsh ; echo ; cat mount ; echo ; cat rtcwake ) >> util-linux
-rm chsh mount rtcwake
-( echo ; cat xmodmap ; echo ; cat xrandr ; echo ; cat xrdb ) >> xhost
-mv xhost xorg-x11-server-utils ; rm xmodmap xrandr xrdb
-
-# Not applicable to Fedora and derivatives:
-rm apache2ctl
-rm apt-build
-rm aptitude
-rm cardctl
-rm heimdal
-rm kldload
-rm lilo
-rm links
-rm lintian
-rm pkg_install
-rm pkgtools
-rm portupgrade
-rm reportbug
-rm sysv-rc
-
-# Not handled due to other reasons (e.g. no known packages) (yet?):
-rm larch
-rm p4
-
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv * $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/plague-client
-
-# Always installed (not triggered) completions for practically always
-# installed packages or non-triggerable common ones:
-for f in bash-builtins configure coreutils dd getent iconv ifupdown \
-    module-init-tools rpm service sh util-linux ; do
-    mv $RPM_BUILD_ROOT%{_datadir}/%{name}/$f .
-done
-install -pm 644 %{SOURCE3} redefine_filedir
-
-cd - # $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-
-%if 0%{?rhel} == 5
- # mock >= 1.1.1, subversion >= 1.6.5-2, yum-utils >= 1.1.24, yum >= 3.2.25-2
-install -pm 644 completions/_{mock,subversion,yum-utils,yum} \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}
-%endif
+# Updated completion shipped in cowsay package:
+rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/{cowsay,cowthink}
 
-# file list
-filelist=$(pwd)/%{name}-files.list
-cd $RPM_BUILD_ROOT%{_datadir}/%{name}
-for f in * ; do
-    [ $f = helpers ] && continue
-    ln -s %{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-    echo "%ghost %{_sysconfdir}/bash_completion.d/$f" >> $filelist
-    echo "%{_datadir}/%{name}/$f" >> $filelist
-done
-cd - # $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -Dpm 644 %{SOURCE3} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/redefine_filedir
 
-# avoid dependency on perl (will only be invoked if perl is installed)
-chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/helpers/perl
+# 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}
@@ -168,250 +72,21 @@ exit $result
 %endif
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-# Note that this *must* be %%define, not %%global, otherwise the %%{?2}/%%{!?2}
-# conditional is apparently evaluated too early (at spec parse time when arg 2
-# is never defined)?
-%define bashcomp_trigger() \
-%if 0%{?fedora} || 0%{?rhel} > 5\
-%triggerin -p <lua> -- %{?2}%{!?2:%1}\
-if not posix.access("%{_sysconfdir}/bash_completion.d/%1") then\
-    posix.symlink("%{_datadir}/%{name}/%1",\
-                  "%{_sysconfdir}/bash_completion.d/%1")\
-end\
-%else\
-%triggerin -- %{?2}%{!?2:%1}\
-[ -e %{_sysconfdir}/bash_completion.d/%1 ] || \\\
-    ln -s %{_datadir}/%{name}/%1 %{_sysconfdir}/bash_completion.d || :\
-%endif\
-%triggerun -- %{?2}%{!?2:%1}\
-[ $2 -gt 0 ]%{?3: || [ -x %3 ]}%{?4: || [ -x %4 ]}%{?5: || [ -x %5 ]} || \\\
-    rm -f %{_sysconfdir}/bash_completion.d/%1 || :\
-%{nil}
-
-%bashcomp_trigger abook
-%bashcomp_trigger ant
-%bashcomp_trigger apt
-%bashcomp_trigger aptitude
-%bashcomp_trigger aspell
-%bashcomp_trigger autoconf
-%bashcomp_trigger automake
-%bashcomp_trigger autorpm
-%bashcomp_trigger bind-utils
-%bashcomp_trigger bitkeeper
-%bashcomp_trigger bittorrent
-%bashcomp_trigger bluez
-%bashcomp_trigger brctl bridge-utils
-%bashcomp_trigger bzip2
-%bashcomp_trigger cfengine
-%bashcomp_trigger chkconfig
-%bashcomp_trigger cksfv
-%bashcomp_trigger clisp
-%bashcomp_trigger cpan2dist perl-CPANPLUS
-%bashcomp_trigger cpio
-%bashcomp_trigger crontab cronie,vixie-cron %{_bindir}/crontab
-%bashcomp_trigger cryptsetup cryptsetup-luks
-%bashcomp_trigger cups
-%bashcomp_trigger cvs
-%bashcomp_trigger cvsps
-%bashcomp_trigger dhclient
-%bashcomp_trigger dict dictd
-%bashcomp_trigger dpkg
-%bashcomp_trigger dselect
-%bashcomp_trigger dsniff
-%bashcomp_trigger dvd+rw-tools
-%bashcomp_trigger e2fsprogs
-%bashcomp_trigger findutils
-%bashcomp_trigger freeciv
-%bashcomp_trigger freerdp
-%bashcomp_trigger fuse
-%bashcomp_trigger gcc
-%bashcomp_trigger gcl
-%bashcomp_trigger gdb
-%bashcomp_trigger genisoimage
-%bashcomp_trigger gkrellm
-%bashcomp_trigger gnatmake gcc-gnat
-%bashcomp_trigger gpg gnupg
-%bashcomp_trigger gpg2 gnupg2
-%bashcomp_trigger gzip
-%bashcomp_trigger hping2 hping3
-%bashcomp_trigger imagemagick ImageMagick
-%bashcomp_trigger iftop
-%bashcomp_trigger info
-%bashcomp_trigger ipmitool
-%bashcomp_trigger iproute2 iproute
-%bashcomp_trigger ipsec openswan
-%bashcomp_trigger iptables
-%bashcomp_trigger ipv6calc
-%bashcomp_trigger isql unixODBC
-%bashcomp_trigger jar java-1.6.0-openjdk-devel
-%bashcomp_trigger java java-1.6.0-openjdk
-%bashcomp_trigger k3b
-%bashcomp_trigger ldapvi
-%bashcomp_trigger lftp
-%bashcomp_trigger lisp cmucl
-%bashcomp_trigger lrzip
-%bashcomp_trigger lsof
-%bashcomp_trigger lvm lvm2
-%bashcomp_trigger lzma xz-lzma-compat
-%bashcomp_trigger lzop
-%bashcomp_trigger mailman
-%bashcomp_trigger make
-%bashcomp_trigger man man-db,man %{_bindir}/man
-%bashcomp_trigger mc
-%bashcomp_trigger mcrypt
-%bashcomp_trigger mdadm
-%bashcomp_trigger medusa
-%bashcomp_trigger minicom
-%bashcomp_trigger mkinitrd
-
-%if 0%{?rhel} == 5
-%triggerin -- mock
-if [ -e %{_sysconfdir}/bash_completion.d/mock.bash ] ; then
-    # Upstream completion in mock >= 1.1.1
-    rm -f %{_sysconfdir}/bash_completion.d/_mock || :
-elif [ ! -e %{_sysconfdir}/bash_completion.d/_mock ] ; then
-    ln -s %{_datadir}/%{name}/_mock %{_sysconfdir}/bash_completion.d || :
-fi
-%triggerun -- mock
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_mock || :
-%endif
-
-%bashcomp_trigger monodevelop
-%bashcomp_trigger mplayer
-%bashcomp_trigger msynctool
-%bashcomp_trigger mtx
-%bashcomp_trigger munin-node
-%bashcomp_trigger mutt
-%bashcomp_trigger mysqladmin mysql,MySQL-client-community %{_bindir}/mysqladmin
-%bashcomp_trigger ncftp
-%bashcomp_trigger net-tools
-%bashcomp_trigger nmap
-%bashcomp_trigger ntpdate
-%bashcomp_trigger open-iscsi iscsi-initiator-utils
-%bashcomp_trigger openldap openldap-clients
-%bashcomp_trigger openssl
-%bashcomp_trigger perl
-%bashcomp_trigger pine
-%bashcomp_trigger pkg-config pkgconfig
-%bashcomp_trigger plague-client
-%bashcomp_trigger pm-utils
-%bashcomp_trigger postfix
-%bashcomp_trigger postgresql
-%bashcomp_trigger povray
-%bashcomp_trigger procps
-%bashcomp_trigger python
-%bashcomp_trigger qdbus qt,kdelibs3,kdelibs %{_bindir}/qdbus %{_bindir}/dcop
-%bashcomp_trigger qemu
-%bashcomp_trigger quota-tools quota
-%bashcomp_trigger rcs
-%bashcomp_trigger rdesktop
-%bashcomp_trigger resolvconf
-%bashcomp_trigger rfkill
-%bashcomp_trigger ri ruby-ri
-%bashcomp_trigger rpcdebug nfs-utils
-%bashcomp_trigger rpmcheck
-%bashcomp_trigger rrdtool
-%bashcomp_trigger rsync
-%bashcomp_trigger samba samba-common
-%bashcomp_trigger sbcl
-%bashcomp_trigger screen
-%bashcomp_trigger shadow shadow-utils
-%bashcomp_trigger sitecopy
-%bashcomp_trigger smartctl smartmontools
-%bashcomp_trigger snownews
-%bashcomp_trigger sqlite3 sqlite
-%bashcomp_trigger ssh openssh-clients
-%bashcomp_trigger sshfs fuse-sshfs
-%bashcomp_trigger strace
-
-%if 0%{?rhel} == 5
-%triggerin -- subversion
-if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
-    # Upstream completion in subversion >= 1.6.5-2
-    rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
-elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then
-    ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || :
-fi
-%triggerun -- subversion
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
-%endif
-
-%bashcomp_trigger svk perl-SVK
-%bashcomp_trigger sysbench
-%bashcomp_trigger tar
-%bashcomp_trigger tcpdump
-%bashcomp_trigger unace
-%bashcomp_trigger unrar
-%bashcomp_trigger vncviewer tigervnc,vnc %{_bindir}/vncviewer
-%bashcomp_trigger vpnc
-%bashcomp_trigger wireless-tools
-%bashcomp_trigger wodim
-%bashcomp_trigger wol
-%bashcomp_trigger wtf bsd-games
-%bashcomp_trigger wvdial
-%bashcomp_trigger xm xen
-%bashcomp_trigger xmllint libxml2
-%bashcomp_trigger xmlwf expat
-%bashcomp_trigger xmms
-%bashcomp_trigger xorg-x11-server-utils
-%bashcomp_trigger xsltproc libxslt
-%bashcomp_trigger xz
-%bashcomp_trigger yp-tools
-
-%if 0%{?rhel} == 5
-%triggerin -- yum
-if [ -e %{_sysconfdir}/bash_completion.d/yum.bash ] ; then
-    # Upstream completion in yum >= 3.2.25-2
-    rm -f %{_sysconfdir}/bash_completion.d/_yum || :
-elif [ ! -e %{_sysconfdir}/bash_completion.d/_yum ] ; then
-    ln -s %{_datadir}/%{name}/_yum %{_sysconfdir}/bash_completion.d || :
-fi
-%triggerun -- yum
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_yum || :
-
-%triggerin -- yum-utils
-if [ -e %{_sysconfdir}/bash_completion.d/yum-utils.bash ] ; then
-    # Upstream completion in yum-utils >= 1.1.24
-    rm -f %{_sysconfdir}/bash_completion.d/_yum-utils || :
-elif [ ! -e %{_sysconfdir}/bash_completion.d/_yum-utils ] ; then
-    ln -s %{_datadir}/%{name}/_yum-utils %{_sysconfdir}/bash_completion.d || :
-fi
-%triggerun -- yum-utils
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/_yum-utils || :
-%endif
-
-%bashcomp_trigger yum-arch
-
-
-%files -f %{name}-files.list
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGES CHANGES.package.old COPYING README TODO
-%config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
-%{_sysconfdir}/bash_completion
-%dir %{_sysconfdir}/bash_completion.d/
-%{_sysconfdir}/bash_completion.d/bash-builtins
-%{_sysconfdir}/bash_completion.d/configure
-%{_sysconfdir}/bash_completion.d/coreutils
-%{_sysconfdir}/bash_completion.d/dd
-%{_sysconfdir}/bash_completion.d/getent
-%{_sysconfdir}/bash_completion.d/iconv
-%{_sysconfdir}/bash_completion.d/ifupdown
-%{_sysconfdir}/bash_completion.d/module-init-tools
-%{_sysconfdir}/bash_completion.d/redefine_filedir
-%{_sysconfdir}/bash_completion.d/rpm
-%{_sysconfdir}/bash_completion.d/service
-%{_sysconfdir}/bash_completion.d/sh
-%{_sysconfdir}/bash_completion.d/util-linux
-%dir %{_datadir}/%{name}/
-%dir %{_datadir}/%{name}/helpers/
-%attr(755,root,root) %{_datadir}/%{name}/helpers/perl
+%files
+%doc AUTHORS CHANGES CHANGES.package.old COPYING README
+# Temporarily not noreplace for < 1.90 to 1.90+ updates (changed location)
+%config %{_sysconfdir}/profile.d/bash_completion.sh
+%{_sysconfdir}/bash_completion.d/
+%{_datadir}/bash-completion/
+%{_datadir}/pkgconfig/bash-completion.pc
 
 
 %changelog
+* Fri Nov  4 2011 Ville Skyttä <ville.skytta@iki.fi> - 1:1.90-1
+- Update to 1.90.
+- Specfile cleanups.
+- Move pre-1.2 %%changelog entries to CHANGES.package.old.
+
 * Mon Sep  5 2011 Ville Skyttä <ville.skytta@iki.fi> - 1:1.3-6
 - Apply upstream patch providing a config and profile hook to make it
   easier to disable bash-completion on per user basis.
@@ -461,44 +136,3 @@ fi
 * Wed Jun 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 1:1.2-1
 - Update to 1.2, all patches applied upstream.
 - Fixes #444469, #538433, #541423, and #601813, works around #585384.
-
-* Fri Mar 12 2010 Ville Skyttä <ville.skytta@iki.fi> - 1:1.1-7
-- Autoinstall dpkg and dselect completions.
-
-* Thu Mar 11 2010 Todd Zullinger <tmz@pobox.com> - 1:1.1-6
-- Apply upstream post 1.1 service argument fix (#572794).
-
-* Sat Dec 26 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.1-5
-- Apply upstream post 1.1 generic vncviewer fixes.
-- Autoinstall vncviewer completion also on tigervnc.
-- Autoinstall chsh completion also on util-linux.
-
-* Tue Dec 15 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.1-4
-- Fix autoinstall of completions named other than the package (#546905).
-- Use environment-modules upstream completion instead of ours if available.
-- Autoinstall mysqladmin completion also on MySQL-client-community.
-
-* Tue Nov 17 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.1-3
-- Prepare for smooth coexistence with yum upstream completion.
-
-* Sun Nov  8 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.1-2
-- Use yum-utils completion instead of ours if available.
-
-* Mon Oct 19 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.1-1
-- Update to 1.1.
-- bash 4 quoting fix, mock and repomanage completions included upstream.
-
-* Sun Sep 20 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.0-5
-- Use svn completion from subversion instead of ours if available (#496456).
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat Apr 18 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.0-3
-- Do not install cowsay completion, an updated version is shipped with it.
-
-* Tue Apr  7 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.0-2
-- Apply upstream patch to fix quoting issues with bash 4.x (#490322).
-
-* Mon Apr  6 2009 Ville Skyttä <ville.skytta@iki.fi> - 1:1.0-1
-- 1.0.
diff --git a/sources b/sources
index b42ecbf..359481a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fcd2bf5bafefa45ebede53805bb397f7  CHANGES.package.old
-a1262659b4bbf44dc9e59d034de505ec  bash-completion-1.3.tar.bz2
+26caffcd8a2ed8a8aaec3cca13d9bf0a  CHANGES.package.old
+82635839d83074eba923822fd584490c  bash-completion-1.90.tar.bz2