From e39f22e91c9e9ea5e2813c30fe89df8038d60013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 29 Apr 2008 17:12:49 +0000
Subject: [PATCH] - Media player association improvements (#444467).

---
 ... bash-completion-20060301-mediafiles-444467.patch | 12 ++++++------
 bash-completion.spec                                 |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename bash-completion-20060301-vdrfiles.patch => bash-completion-20060301-mediafiles-444467.patch (57%)

diff --git a/bash-completion-20060301-vdrfiles.patch b/bash-completion-20060301-mediafiles-444467.patch
similarity index 57%
rename from bash-completion-20060301-vdrfiles.patch
rename to bash-completion-20060301-mediafiles-444467.patch
index b0353cf..c9058fd 100644
--- a/bash-completion-20060301-vdrfiles.patch
+++ b/bash-completion-20060301-mediafiles-444467.patch
@@ -1,20 +1,20 @@
---- bash_completion~	2006-03-01 18:20:18.000000000 +0200
-+++ bash_completion	2007-12-16 11:42:40.000000000 +0200
-@@ -94,7 +94,7 @@
+--- bash_completion.orig	2006-03-01 18:20:18.000000000 +0200
++++ bash_completion	2008-04-28 20:52:32.000000000 +0300
+@@ -94,7 +94,7 @@ complete -f -X '!*.@(?(e)ps|?(E)PS)' ps2
  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)' 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|mng|MNG)' xine aaxine fbxine kaffeine
-+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|mng|MNG)|[0-9]*.@(vdr|VDR))' xine aaxine fbxine kaffeine
++complete -f -X '!*@(.@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|as[fx]|AS[FX]|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|p?(e)s|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|og[gm]|OG[GM]|wav|WAV|mng|MNG)|[0-9]*.@(vdr|VDR))' 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
-@@ -5888,7 +5888,7 @@
+@@ -5888,7 +5888,7 @@ _mplayer()
  					-xvidencopts -of --verbose' -- $cur) )
  			;;
  		*)
 -			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3gp|mpc|MPC|flac|FLAC)'
-+			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fli|FLI|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3gp|mpc|MPC|flac|FLAC|vdr|VDR)'
++			_filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|p?(e)s|P?(E)S|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|og[gm]|OG[GM]|wav|WAV|dump|DUMP|mkv|MKV|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3gp|mpc|MPC|flac|FLAC|vdr|VDR)'
  			;;
  	esac
  
diff --git a/bash-completion.spec b/bash-completion.spec
index 3349626..5a9c8ef 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20060301
-Release:        10
+Release:        11
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -14,7 +14,7 @@ Patch0:         %{name}-20060301-scp-apos-217178.patch
 Patch1:         %{name}-20060301-debian.patch
 Patch2:         %{name}-20060301-perl-299571.patch
 Patch3:         %{name}-20060301-jpeg2000-304771.patch
-Patch4:         %{name}-20060301-vdrfiles.patch
+Patch4:         %{name}-20060301-mediafiles-444467.patch
 Patch5:         %{name}-20060301-svn-filenames-430059.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -195,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 29 2008 Ville Skyttä <ville.skytta at iki.fi> - 20060301-11
+- Media player association improvements (#444467).
+
 * Sat Feb 23 2008 Ville Skyttä <ville.skytta at iki.fi> - 20060301-10
 - Patch to fix filename completion with svn (#430059).
 - Trigger-install support for dsniff.