rpms/bash-completion/devel bash-completion-20060301-vdrfiles.patch, NONE, 1.1 bash-completion-mock, 1.3, 1.4 bash-completion.spec, 1.23, 1.24

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17305

Modified Files:
	bash-completion-mock bash-completion.spec 
Added Files:
	bash-completion-20060301-vdrfiles.patch 
Log Message:
* Mon Dec 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 20060301-8
- Associate VDR recording files with media players.
- Update mock completion.


bash-completion-20060301-vdrfiles.patch:

--- NEW FILE bash-completion-20060301-vdrfiles.patch ---
--- bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion	2007-12-16 11:42:40.000000000 +0200
@@ -94,7 +94,7 @@
 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 '!*.@(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 @@
 					-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)'
 			;;
 	esac
 


Index: bash-completion-mock
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-mock,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bash-completion-mock	16 Nov 2007 22:07:07 -0000	1.3
+++ bash-completion-mock	30 Dec 2007 22:23:36 -0000	1.4
@@ -1,13 +1,14 @@
 # bash completion for mock                                           -*- sh -*-
 
+# TODO: --copyin, --copyout
+
 _mock()
 {
-    local cur prev commands plugins cfgdir
+    local cur prev plugins cfgdir
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
     prev=${COMP_WORDS[COMP_CWORD-1]}
-    commands='rebuild chroot init clean shell installdeps install'
     plugins='ccache yum_cache root_cache bind_mount'
     cfgdir=/etc/mock
 
@@ -46,18 +47,20 @@
                 COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
                 return 0
                 ;;
-            -@(-arch|-uniqueext|-rpmbuild_timeout))
+            --@(arch|define|with|without|uniqueext|rpmbuild_timeout))
                 return 0
                 ;;
         esac
     fi
 
-    # TODO: process $commands
     if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean \
-            --cleanup-after --no-cleanup-after --arch= --resultdir= \
-            --uniqueext= --configdir= --rpmbuild_timeout= --enable-plugin= \
-            --disable-plugin=' -- $cur ) )
+        COMPREPLY=( $( compgen -W '--version -h --help --rebuild --chroot \
+            --shell --clean --init --installdeps --install --update \
+            --orphanskill -r --offline --no-clean --cleanup-after \
+            --no-cleanup-after --arch= --define= --with= --without= \
+            --resultdir= --uniqueext= --configdir= --rpmbuild_timeout -v \
+            --verbose -q --quiet --trace --enable-plugin= --disable-plugin=' \
+            -- $cur ) )
     else
         _filedir '?(no)src.rpm'
     fi


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- bash-completion.spec	16 Nov 2007 22:07:07 -0000	1.23
+++ bash-completion.spec	30 Dec 2007 22:23:36 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20060301
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -14,6 +14,7 @@
 Patch1:         %{name}-20060301-debian.patch
 Patch2:         %{name}-20060301-perl-299571.patch
 Patch3:         %{name}-20060301-jpeg2000-304771.patch
+Patch4:         %{name}-20060301-vdrfiles.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,6 +31,7 @@
 %patch1
 %patch2
 %patch3
+%patch4
 f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 install -pm 644 %{SOURCE2} contrib/mock
 install -pm 644 %{SOURCE3} contrib/plague-client
@@ -186,6 +188,10 @@
 
 
 %changelog
+* Mon Dec 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 20060301-8
+- Associate VDR recording files with media players.
+- Update mock completion.
+
 * Fri Nov 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 20060301-7
 - Add JPEG2000 extensions for display(1) (#304771).
 - Update mock completion.