rpms/bash-completion/F-8 bash-completion-20060301-jpeg2000-304771.patch, NONE, 1.1 bash-completion-20060301-svn-filenames-430059.patch, NONE, 1.1 bash-completion-20060301-vdrfiles.patch, NONE, 1.1 bash-completion-mock, 1.2, 1.3 bash-completion.spec, 1.21, 1.22

Ville Skytta (scop) fedora-extras-commits at redhat.com
Sat Jan 26 09:03:24 UTC 2008 

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27308/F-8

Modified Files:
	bash-completion-mock bash-completion.spec 
Added Files:
	bash-completion-20060301-jpeg2000-304771.patch 
	bash-completion-20060301-svn-filenames-430059.patch 
	bash-completion-20060301-vdrfiles.patch 
Log Message:
Sync with devel.

bash-completion-20060301-jpeg2000-304771.patch:

--- NEW FILE bash-completion-20060301-jpeg2000-304771.patch ---
--- bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion	2007-11-16 23:23:20.000000000 +0200
@@ -86 +86 @@
-complete -f -X '!*.@(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)' ee display
+complete -f -X '!*.@(gif|jp?(e)g|jp[2cfx]|j2k|miff|tif?(f)|pn[gm]|p[bgp]m|bmp|xpm|ico|xwd|tga|pcx|GIF|JP?(E)G|JP[2CFX]|J2K|MIFF|TIF?(F)|PN[GM]|P[BGP]M|BMP|XPM|ICO|XWD|TGA|PCX)' ee display

bash-completion-20060301-svn-filenames-430059.patch:

--- NEW FILE bash-completion-20060301-svn-filenames-430059.patch ---
diff -up bash_completion~ bash_completion
--- bash_completion~	2006-03-01 18:20:18.000000000 +0200
+++ bash_completion	2008-01-24 20:21:12.000000000 +0200
@@ -9083,7 +9083,7 @@ _svn()
 
 	return 0
 }
-complete -F _svn $default svn
+complete -F _svn $filenames svn
 
 _svnadmin()
 {

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/F-8/bash-completion-mock,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion-mock	30 Aug 2006 21:27:32 -0000	1.2
+++ bash-completion-mock	26 Jan 2008 09:02:47 -0000	1.3
@@ -1,42 +1,66 @@
 # bash completion for mock                                           -*- sh -*-
 
+# TODO: --copyin, --copyout
+
 _mock()
 {
-    local cur prev commands cfgdir
+    local cur prev plugins cfgdir
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
     prev=${COMP_WORDS[COMP_CWORD-1]}
-    commands='rebuild chroot init clean shell'
+    plugins='ccache yum_cache root_cache bind_mount'
     cfgdir=/etc/mock
 
     count=0
     for i in ${COMP_WORDS[@]} ; do
         [ $count -eq $COMP_CWORD ] && break
-        [ "$i" == --configdir ] && cfgdir="${COMP_WORDS[((count+1))]}"
+        if [[ "$i" == --configdir ]] ; then
+            cfgdir="${COMP_WORDS[((count+1))]}"
+        elif [[ "$i" == --configdir=* ]] ; then
+            cfgdir=${i/*=/}
+        fi
         count=$((++count))
     done
 
     case $prev in
-        --@(config|result|state)dir)
-            _filedir -d
-            return 0
-            ;;
         -r)
             COMPREPLY=( $( command ls $cfgdir | \
                 sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
             return 0
             ;;
-        -@(-arch|-uniqueext|-help|h))
+        -@(-help|h))
             return 0
             ;;
     esac
 
-    # TODO: process $commands
+    # --name=value style option
+    if [[ "$cur" == *=* ]] ; then
+        prev=${cur/=*/}
+        cur=${cur/*=/}
+        case $prev in 
+            --@(config|result)dir)
+                _filedir -d
+                return 0
+                ;;
+            --@(en|dis)able-plugin)
+                COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
+                return 0
+                ;;
+            --@(arch|define|with|without|uniqueext|rpmbuild_timeout))
+                return 0
+                ;;
+        esac
+    fi
+
     if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
-            --debug --resultdir --statedir --uniqueext --configdir --quiet \
-            --autocache --rebuildcache' -- $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/F-8/bash-completion.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bash-completion.spec	22 Sep 2007 07:43:01 -0000	1.21
+++ bash-completion.spec	26 Jan 2008 09:02:47 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20060301
-Release:        6%{?dist}
+Release:        9
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -13,6 +13,9 @@
 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
+Patch5:         %{name}-20060301-svn-filenames-430059.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,6 +31,9 @@
 %patch0
 %patch1
 %patch2
+%patch3
+%patch4
+%patch5
 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
@@ -61,7 +67,7 @@
 %define do_triggerun() [ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%1 || :
 
 # Not handled (yet?):
-# bitkeeper, dsniff, harbour, larch, lisp, p4, povray, sitecopy
+# bitkeeper, harbour, larch, lisp, p4, povray, sitecopy
 
 %triggerin -- bittorrent
 %do_triggerin bittorrent
@@ -78,6 +84,11 @@
 %triggerun -- clisp
 %do_triggerun clisp
 
+%triggerin -- dsniff
+%do_triggerin dsniff
+%triggerun -- dsniff
+%do_triggerun dsniff
+
 %triggerin -- freeciv
 %do_triggerin freeciv
 %triggerun -- freeciv
@@ -184,6 +195,19 @@
 
 
 %changelog
+* Fri Jan 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 20060301-9
+- Patch to fix filename completion with svn (#430059).
+- Trigger-install support for dsniff.
+- Drop disttag.
+
+* 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.
+
 * Sat Sep 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 20060301-6
 - Patch to improve perl completion (#299571, Jim Radford,
   http://use.perl.org/~Alias/journal/33508).

More information about the fedora-extras-commits mailing list