rpms/bash-completion/FC-4 bash-completion-documents.patch, NONE, 1.1 bash-completion-players.patch, NONE, 1.1 bash-completion-tarballs.patch, NONE, 1.1 bash-completion.spec, 1.8, 1.9

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/bash-completion/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15858/FC-4

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-documents.patch bash-completion-players.patch 
	bash-completion-tarballs.patch 
Log Message:
- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
- Add/fix support for some multimedia formats and players.
- Fix tarball completion.


bash-completion-documents.patch:

--- NEW FILE bash-completion-documents.patch ---
--- 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

bash-completion-players.patch:

--- NEW FILE bash-completion-players.patch ---
--- 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

bash-completion-tarballs.patch:

--- NEW FILE bash-completion-tarballs.patch ---
--- 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]/}
 


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bash-completion.spec	12 Jul 2005 19:59:19 -0000	1.8
+++ bash-completion.spec	18 Jul 2005 19:58:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050712
-Release:        1%{?dist}
+Release:        1
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -8,10 +8,13 @@
 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
-Requires:       bash >= 0:2.05-12
+Requires:       bash >= 2.05-12
 
 %description
 bash-completion is a collection of shell functions that take advantage
@@ -20,6 +23,9 @@
 
 %prep
 %setup -q -n bash_completion
+%patch0
+%patch1
+%patch2
 
 
 %build
@@ -127,8 +133,11 @@
 
 
 %changelog
-* Tue Jul 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050712-1
+* Mon Jul 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050712-1
 - 20050712.
+- Add more OO.o2 extensions, and *.pdf for evince (#163520, Horst von Brand).
+- Add/fix support for some multimedia formats and players.
+- Fix tarball completion.
 
 * Sat Jan 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:20050121-2
 - Update to 20050121.