packages: bash-completion/bash-completion-mplayer.patch, bash-completion/ba...

glen glen at pld-linux.org
Wed Sep 16 20:12:00 CEST 2009


Author: glen                         Date: Wed Sep 16 18:12:00 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 20090916 snap

---- Files affected:
packages/bash-completion:
   bash-completion-mplayer.patch (1.5 -> 1.6) , bash-completion.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: packages/bash-completion/bash-completion-mplayer.patch
diff -u packages/bash-completion/bash-completion-mplayer.patch:1.5 packages/bash-completion/bash-completion-mplayer.patch:1.6
--- packages/bash-completion/bash-completion-mplayer.patch:1.5	Sun May 24 00:07:28 2009
+++ packages/bash-completion/bash-completion-mplayer.patch	Wed Sep 16 20:11:55 2009
@@ -1,11 +1,11 @@
---- bash-completion/contrib/mplayer~	2009-05-23 23:53:34.000000000 +0300
-+++ bash-completion/contrib/mplayer	2009-05-23 23:56:32.459370190 +0300
-@@ -264,7 +264,7 @@
+--- bash-completion/contrib/mplayer~	2009-09-16 20:48:48.000000000 +0300
++++ bash-completion/contrib/mplayer	2009-09-16 20:58:30.564828512 +0300
+@@ -256,7 +256,7 @@
  			     -e "/^-\(Total\|.*\*\)\?$/!p" )' -- $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|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|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|vdr|VDR|xvid|XVID|ape|APE)'
-+			_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[234]|MP[234]|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|vdr|VDR|xvid|XVID|ape|APE|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[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE)'
++			_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[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|flv|FLV)'
  			;;
  	esac
  

================================================================
Index: packages/bash-completion/bash-completion.spec
diff -u packages/bash-completion/bash-completion.spec:1.150 packages/bash-completion/bash-completion.spec:1.151
--- packages/bash-completion/bash-completion.spec:1.150	Tue Jul 21 06:45:43 2009
+++ packages/bash-completion/bash-completion.spec	Wed Sep 16 20:11:55 2009
@@ -4,18 +4,20 @@
 # - bittorrent complete doesn't actually handle our prognames
 # - use mkinitrd and update for geninitrd
 # - can we have duplicate trigger on pwdutils pkg? merge files?
-# - port msg_usage parsing back from bash-completion-1.0-2.noarch for _service
+# - fix vim not to mark this file as bash
+%define		snap	20090916
+%define		rel		0.3
 Summary:	bash-completion offers programmable completion for bash
 Summary(pl.UTF-8):	Programowalne uzupełnianie nazw dla basha
 Name:		bash-completion
 Version:	1.0
-Release:	3
+Release:	3.%{snap}.%{rel}
 Epoch:		1
 License:	GPL
 Group:		Applications/Shells
 #Source0:	http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
 Source0:	%{name}.tar.bz2
-# Source0-md5:	f4e383c20d0ac662c821c32e675c8d68
+# Source0-md5:	83271aa683e1cc1ebd27fd28e300d39e
 Source1:	%{name}-poldek.sh
 Source2:	%{name}.sh
 Patch0:		%{name}-rpm-cache.patch
@@ -55,6 +57,8 @@
 
 # packaged by subversion.spec
 rm contrib/_subversion
+# soon packaged by yum, but not yet
+mv contrib/{_,}yum
 
 # No package matches '*/apache2ctl'
 rm contrib/apache2ctl
@@ -216,6 +220,7 @@
 %bashcomp_trigger heimdal
 %bashcomp_trigger ImageMagick imagemagick
 %bashcomp_trigger info,pinfo info
+%bashcomp_trigger ipmitool
 %bashcomp_trigger iptables
 %bashcomp_trigger jar
 %bashcomp_trigger java-sun-jre,java-gcj-compat java
@@ -234,6 +239,7 @@
 %bashcomp_trigger man
 %bashcomp_trigger mc
 %bashcomp_trigger mcrypt
+%bashcomp_trigger mdadm
 %bashcomp_trigger minicom
 %bashcomp_trigger mplayer
 %bashcomp_trigger mtx
@@ -266,6 +272,7 @@
 %bashcomp_trigger quota-tools
 %bashcomp_trigger rcs
 %bashcomp_trigger rdesktop
+%bashcomp_trigger resolvconf
 %bashcomp_trigger rpm
 %bashcomp_trigger rrdtool
 %bashcomp_trigger rsync
@@ -295,6 +302,7 @@
 %bashcomp_trigger xz
 %bashcomp_trigger yp-tools
 %bashcomp_trigger yum
+%bashcomp_trigger yum-arch
 
 %files -f %{name}-ghost.list
 %defattr(644,root,root,755)
@@ -347,6 +355,7 @@
 %{_datadir}/%{name}/iconv
 %{_datadir}/%{name}/imagemagick
 %{_datadir}/%{name}/info
+%{_datadir}/%{name}/ipmitool
 %{_datadir}/%{name}/iptables
 %{_datadir}/%{name}/isql
 %{_datadir}/%{name}/jar
@@ -364,6 +373,7 @@
 %{_datadir}/%{name}/man
 %{_datadir}/%{name}/mc
 %{_datadir}/%{name}/mcrypt
+%{_datadir}/%{name}/mdadm
 %{_datadir}/%{name}/minicom
 %{_datadir}/%{name}/mplayer
 %{_datadir}/%{name}/msynctool
@@ -390,6 +400,7 @@
 %{_datadir}/%{name}/quota-tools
 %{_datadir}/%{name}/rcs
 %{_datadir}/%{name}/rdesktop
+%{_datadir}/%{name}/resolvconf
 %{_datadir}/%{name}/ri
 %{_datadir}/%{name}/rpcdebug
 %{_datadir}/%{name}/rpm
@@ -425,6 +436,7 @@
 %{_datadir}/%{name}/xz
 %{_datadir}/%{name}/yp-tools
 %{_datadir}/%{name}/yum
+%{_datadir}/%{name}/yum-arch
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -432,6 +444,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2009/09/16 18:11:55  glen
+- update to 20090916 snap
+
 Revision 1.150  2009/07/21 04:45:43  glen
 - update to new snap
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion-mplayer.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion.spec?r1=1.150&r2=1.151&f=u



More information about the pld-cvs-commit mailing list