From 0ab276f480341231a4a5923feb214f09bd6b57fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 2 Apr 2009 16:04:40 +0000 Subject: [PATCH] - update to 20081219 Changed files: bash-completion-mplayer.patch -> 1.2 bash-completion-rpm-cache.patch -> 1.4 --- bash-completion-mplayer.patch | 20 ++++++-------------- bash-completion-rpm-cache.patch | 8 ++++---- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/bash-completion-mplayer.patch b/bash-completion-mplayer.patch index 953ec7d..f99ef80 100644 --- a/bash-completion-mplayer.patch +++ b/bash-completion-mplayer.patch @@ -1,20 +1,12 @@ ---- bash_completion/bash_completion 2006-12-28 19:32:42.210690440 +0200 -+++ bash_completion/bash_completion 2006-12-28 19:33:33.611846134 +0200 -@@ -5639,7 +5639,7 @@ - if [ -n "$MPLAYER_SKINS_DIR" ]; then - skinsdir=$MPLAYER_SKINS_DIR - else -- skinsdir=/usr/local/share/mplayer/Skin -+ skinsdir=/usr/share/mplayer/Skin - fi - - IFS=$'\t\n' -@@ -5893,7 +5893,7 @@ +--- bash-completion/bash_completion~ 2009-04-02 18:59:35.000000000 +0300 ++++ bash-completion/bash_completion 2009-04-02 19:01:46.032949230 +0300 +@@ -6056,7 +6056,8 @@ -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|flv|FLV)' +- _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|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS)' ++ _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|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|flv|FLV)' ++ _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 ;; esac diff --git a/bash-completion-rpm-cache.patch b/bash-completion-rpm-cache.patch index f2c6d83..01ed59a 100644 --- a/bash-completion-rpm-cache.patch +++ b/bash-completion-rpm-cache.patch @@ -1,6 +1,6 @@ ---- bash_completion/bash_completion 2008-01-08 02:50:17.000000000 +0200 -+++ bash_completion/bash_completion 2008-02-20 17:08:23.134899356 +0200 -@@ -1732,29 +1732,26 @@ +--- bash-completion/bash_completion~ 2009-04-02 18:56:57.000000000 +0300 ++++ bash-completion/bash_completion 2009-04-02 18:58:54.003383671 +0300 +@@ -1836,29 +1836,26 @@ # _rpm_installed_packages() { @@ -32,7 +32,7 @@ - nosig="" - ver=$(rpm --version) - ver=${ver##* } -- +- - if [[ "$ver" > "4.0.4" ]]; then - nodig="--nodigest" - fi -- 2.44.0