diff --git a/.cvsignore b/.cvsignore index f64fb51..922c5b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bash-completion-20050712.tar.bz2 +bash-completion-20050720.tar.bz2 diff --git a/bash-completion-documents.patch b/bash-completion-documents.patch deleted file mode 100644 index 85481e8..0000000 --- a/bash-completion-documents.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 -+++ bash_completion 2005-07-18 18:53:12.000000000 +0300 -@@ -89,3 +89,3 @@ - complete -f -X '!*.@(dvi|DVI)' dvips dviselect dvitype --complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf -+complete -f -X '!*.@(pdf|PDF)' acroread gpdf xpdf kpdf evince - complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf -@@ -108,5 +108,8 @@ - complete -f -X '!*.@(?([xX]|[sS])[hH][tT][mM]?([lL]))' netscape mozilla lynx opera galeon curl dillo elinks amaya --complete -f -X '!*.@(sxw|stw|sxg|doc|dot|rtf|txt|htm|html|odt|ott)' oowriter -+complete -f -X '!*.@(sxw|stw|sxg|sgl|doc|dot|rtf|txt|htm|html|odt|ott|odm)' oowriter - complete -f -X '!*.@(sxi|sti|pps|ppt|pot|odp|otp)' ooimpress - complete -f -X '!*.@(sxc|stc|xls|xlw|xlt|csv|ods|ots)' oocalc -+complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw -+complete -f -X '!*.@(sxm|smf|mml|odf)' oomath -+complete -f -X '!*.odb' oobase - complete -f -X '!*.rpm' rpm2cpio diff --git a/bash-completion-players.patch b/bash-completion-players.patch deleted file mode 100644 index 7ca6b5e..0000000 --- a/bash-completion-players.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 -+++ bash_completion 2005-07-16 23:55:54.000000000 +0300 -@@ -91,8 +91,8 @@ - complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2pdf - complete -f -X '!*.texi*' makeinfo texi2html - complete -f -X '!*.@(?(la)tex|?(LA)TEX|texi|TEXI|dtx|DTX|ins|INS)' tex latex slitex jadetex pdfjadetex pdftex pdflatex texi2dvi --complete -f -X '!*.@(mp3|MP3|m3u)' mpg123 mpg321 --complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine -+complete -f -X '!*.@(mp3|MP3)' mpg123 mpg321 madplay -+complete -f -X '!*.@(mp?(e)g|MP?(E)G|wma|avi|AVI|asf|vob|VOB|bin|dat|vcd|ps|pes|fli|viv|rm|ram|yuv|mov|MOV|qt|QT|wmv|mp3|MP3|ogg|OGG|ogm|OGM|mp4|MP4|wav|WAV|asx|ASX)' xine aaxine fbxine kaffeine - 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 -@@ -5687,7 +5687,7 @@ - - return 0 - } --complete $filenames -F _mplayer mplayer mencoder gmplayer -+complete $filenames -F _mplayer mplayer mencoder gmplayer kplayer - } - - # KDE dcop completion diff --git a/bash-completion-tarballs.patch b/bash-completion-tarballs.patch deleted file mode 100644 index 18911ed..0000000 --- a/bash-completion-tarballs.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- bash_completion~ 2005-07-12 22:13:02.000000000 +0300 -+++ bash_completion 2005-07-16 23:55:54.000000000 +0300 -@@ -77,7 +77,7 @@ - # Do NOT break these over multiple lines. - # - # START exclude -- do NOT remove this line --complete -f -X '!*.?(t)bz2' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep -+complete -f -X '!*.?(t)bz?(2)' bunzip2 bzcat bzcmp bzdiff bzegrep bzfgrep bzgrep - complete -f -X '!*.@(zip|ZIP|jar|JAR|exe|EXE|pk3|war|wsz|ear|zargo|xpi|sxw)' unzip zipinfo - complete -f -X '*.Z' compress znew - complete -f -X '!*.@(Z|gz|tgz|Gz|dz)' gunzip zcmp zdiff zcat zegrep zfgrep zgrep zless zmore -@@ -101,7 +101,7 @@ - complete -f -X '!*.fig' xfig - complete -f -X '!*.@(mid?(i))' playmidi - complete -f -X '!*.@(mid?(i)|rmi|RMI)' timidity --complete -f -X '*.@(o|so|so.!(conf)|a|tar?(.@(gz|bz2))|tgz|tbz2|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview -+complete -f -X '*.@(o|so|so.!(conf)|a|t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))|rpm|zip|ZIP|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' vi vim gvim rvim view rview rgvim rgview gview - complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|GIF|jp?(e)g|JP?(E)G|mp3|MP3|mp?(e)g|MPG|avi|AVI|asf|ASF|ogg|OGG|class|CLASS)' emacs - complete -f -X '!*.@(exe|EXE|com|COM|scr|SCR)' wine - complete -f -X '!*.@(zip|ZIP|z|Z|gz|GZ|tgz|TGZ)' bzme -@@ -2791,16 +2791,16 @@ - return 0 - ;; - +([^IZzjy])f) -- ext='t?(ar?(.))@(gz|Z|bz?(2))' -- regex='t\(ar?(\.)\)\(gz\|Z\|bz2\?\)' -+ ext='t@(ar?(.@(Z|gz|bz?(2)))|gz|bz?(2))' -+ regex='t\(ar\(\.\(Z\|gz\|bz2\?\)\)\?\|gz\|bz2\?\)' - ;; - *[Zz]*f) - ext='t?(ar.)@(gz|Z)' -- regex='t\(ar\.\)\(gz\|Z\)' -+ regex='t\(ar\.\)\?\(gz\|Z\)' - ;; - *[Ijy]*f) - ext='t?(ar.)bz?(2)' -- regex='t\(ar\.\)bz2\?' -+ regex='t\(ar\.\)\?bz2\?' - ;; - *) - _filedir -@@ -2814,7 +2814,7 @@ - # - # get name of tar file from command line - tar=$( echo "$COMP_LINE" | \ -- sed -e 's|^.* \([^ ]*'$regex'\) .*$|\1|' ) -+ sed -e 's/^.* \([^ ]*'$regex'\) .*$/\1/' ) - # devise how to untar and list it - untar=t${COMP_WORDS[1]//[^Izjyf]/} - diff --git a/bash-completion.spec b/bash-completion.spec index 64848c0..0c88f6e 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -1,6 +1,6 @@ Name: bash-completion -Version: 20050712 -Release: 1 +Version: 20050720 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells @@ -8,9 +8,6 @@ License: GPL URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 Source1: %{name}.profile -Patch0: %{name}-tarballs.patch -Patch1: %{name}-players.patch -Patch2: %{name}-documents.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,9 +20,6 @@ of the programmable completion feature of bash 2. %prep %setup -q -n bash_completion -%patch0 -%patch1 -%patch2 %build @@ -133,6 +127,9 @@ fi %changelog +* Wed Jul 20 2005 Ville Skyttä - 20050720-1 +- 20050720, all patches applied upstream. + * Mon Jul 18 2005 Ville Skyttä - 20050712-1 - 20050712. - Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand). diff --git a/sources b/sources index 0091f59..1e6b3b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f38a59eabf97a6dd7db0f10c0ee5063 bash-completion-20050712.tar.bz2 +2118a649a55350358d879ca28e7e7d77 bash-completion-20050720.tar.bz2