diff --git a/bash-completion-1.3-latexdbj-678122.patch b/bash-completion-1.3-latexdbj-678122.patch new file mode 100644 index 0000000..a7ca11f --- /dev/null +++ b/bash-completion-1.3-latexdbj-678122.patch @@ -0,0 +1,19 @@ +commit 2eb713ff764b8a3d4baf2c1353d5474d5c3c74ed +Author: Ted Pavlic +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 new file mode 100644 index 0000000..71cdd6d --- /dev/null +++ b/bash-completion-1.3-libreoffice-692548.patch @@ -0,0 +1,25 @@ +commit e10848b7e5613cf07d00f05d0bcafdc0625042ff +Author: Matej Cepl +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 new file mode 100644 index 0000000..00cbe9e --- /dev/null +++ b/bash-completion-1.3-manpager-689180.patch @@ -0,0 +1,12 @@ +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-yeswehave.patch b/bash-completion-1.3-yeswehave.patch new file mode 100644 index 0000000..7945304 --- /dev/null +++ b/bash-completion-1.3-yeswehave.patch @@ -0,0 +1,16 @@ +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-04-12 21:34:55.527355045 +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 --git a/bash-completion.spec b/bash-completion.spec index f0b3607..855462d 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -3,7 +3,7 @@ Name: bash-completion Version: 1.3 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Programmable completion for Bash @@ -15,8 +15,16 @@ Source1: %{name}-plague-client Source2: CHANGES.package.old # 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 # From upstream post 1.3 git -Patch1: %{name}-1.3-gendiff.patch +Patch2: %{name}-1.3-gendiff.patch +# From upstream post 1.3 git +Patch3: %{name}-1.3-manpager-689180.patch +# From upstream post 1.3 git +Patch4: %{name}-1.3-libreoffice-692548.patch +# From upstream post 1.3 git +Patch5: %{name}-1.3-latexdbj-678122.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -38,6 +46,10 @@ of the programmable completion feature of bash. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 install -pm 644 %{SOURCE2} . @@ -368,6 +380,12 @@ fi %changelog +* Tue Apr 12 2011 Ville Skyttä - 1:1.3-3 +- Patch to not test command availability for each snippet, improves load time. +- Apply upstream libreoffice flat XML extensions fix for #692548. +- Apply upstream MANPAGER fix for #689180. +- Apply upstream (la)tex *.dbj fix for #678122. + * Mon Feb 07 2011 Fedora Release Engineering - 1:1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild