packages: bash-completion/bash-completion-rpm-cache.patch, bash-completion/...
glen
glen at pld-linux.org
Tue Jul 21 06:45:49 CEST 2009
Author: glen Date: Tue Jul 21 04:45:49 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- update to new snap
---- Files affected:
packages/bash-completion:
bash-completion-rpm-cache.patch (1.6 -> 1.7) , bash-completion.spec (1.149 -> 1.150)
---- Diffs:
================================================================
Index: packages/bash-completion/bash-completion-rpm-cache.patch
diff -u packages/bash-completion/bash-completion-rpm-cache.patch:1.6 packages/bash-completion/bash-completion-rpm-cache.patch:1.7
--- packages/bash-completion/bash-completion-rpm-cache.patch:1.6 Mon Apr 13 15:40:30 2009
+++ packages/bash-completion/bash-completion-rpm-cache.patch Tue Jul 21 06:45:43 2009
@@ -1,39 +1,37 @@
---- bash-completion-1.0/bash_completion~ 2009-04-13 16:21:42.000000000 +0300
-+++ bash-completion-1.0/bash_completion 2009-04-13 16:28:42.911409892 +0300
-@@ -1940,17 +1940,30 @@
+--- bash-completion/contrib/rpm~ 2009-07-21 06:28:45.000000000 +0300
++++ bash-completion/contrib/rpm 2009-07-21 06:37:08.381279143 +0300
+@@ -6,17 +6,31 @@
#
_rpm_installed_packages()
{
- local ver nodig="$1" nosig="$2"
+ local nodig="$1" nosig="$2"
-
-- if [ -r /var/log/rpmpkgs -a \
-- /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
++
+ # if rpm (4.4.7+) is configured to export it's rpmdb to /var/cache/hrmib (%_hrmib_path)
+ if [ -d /var/cache/hrmib -a -r /var/cache/hrmib ]; then
+ COMPREPLY=( $( LC_ALL=C command ls -1 /var/cache/hrmib | sed -ne '/^'$cur'/p') )
+ return
+ fi
+
-+ # refresh cache if writable
++ # refresh cache if writable. FHS location
+ if [ -w /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -ot /var/lib/rpm/Packages ]; then
+ # we grab the output to local variable to prevent possible race
+ _rpm_nodigsig
+ local tmp=$(rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n')
+ echo "$tmp" > /var/cache/rpmpkgs.txt
+ fi
-+
-+ if [ -r /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -nt /var/lib/rpm/Packages ]; then
+
+ if [ -r /var/log/rpmpkgs -a \
+ /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
# using RHL 7.2 or later - this is quicker than querying the DB
COMPREPLY=( $( sed -ne \
- 's|^\('$cur'[^[:space:]]*\)-[^[:space:]-]\+-[^[:space:]-]\+\.rpm$|\1|p' \
-- /var/log/rpmpkgs ) )
+ 's|^\('$cur'.*\)\.rpm$|\1|p' \
-+ /var/cache/rpmpkgs.txt ) )
+ /var/log/rpmpkgs ) )
else
_rpm_nodigsig
- COMPREPLY=( $( rpm -qa $nodig $nosig --qf='%{NAME} ' "$cur*" ) )
-+ COMPREPLY=( $( rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) )
++ COMPREPLY=( $( rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) )
fi
}
================================================================
Index: packages/bash-completion/bash-completion.spec
diff -u packages/bash-completion/bash-completion.spec:1.149 packages/bash-completion/bash-completion.spec:1.150
--- packages/bash-completion/bash-completion.spec:1.149 Sun May 24 00:14:15 2009
+++ packages/bash-completion/bash-completion.spec Tue Jul 21 06:45:43 2009
@@ -3,6 +3,8 @@
# TODO
# - 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
Summary: bash-completion offers programmable completion for bash
Summary(pl.UTF-8): Programowalne uzupełnianie nazw dla basha
Name: bash-completion
@@ -13,7 +15,7 @@
Group: Applications/Shells
#Source0: http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
Source0: %{name}.tar.bz2
-# Source0-md5: 296df2d2ac8b9826d73ff7d559333023
+# Source0-md5: f4e383c20d0ac662c821c32e675c8d68
Source1: %{name}-poldek.sh
Source2: %{name}.sh
Patch0: %{name}-rpm-cache.patch
@@ -45,6 +47,9 @@
%patch3 -p1
cp -a %{SOURCE1} contrib/poldek
+# this is dir
+rm -r doc/html~
+
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -57,12 +62,17 @@
# No PLD package or no such binary to complete on
rm contrib/{harbour,larch,lisp,modules,monodevelop,p4,cowsay,cpan2dist}
rm contrib/{cfengine,mkinitrd,repomanage,rpmcheck}
+rm contrib/{kldload,pkg_install,portupgrade,pkgtools} # FreeBSD Stuff
+rm contrib/{apt-build,dselect,mock,reportbug,sysv-rc,update-alternatives}
+
+# no package to hook to
+rm contrib/configure
# split freeciv-client,freeciv-server as we have these in separate packages
mv contrib/freeciv .
%{__sed} -ne '1,/complete -F _civserver civserver/p' freeciv > contrib/freeciv-server
%{__sed} -ne '1,3p;/civclient/,$p' freeciv > contrib/freeciv-client
-if [ $(md5sum freeciv | awk '{print $1}') != "eb862866780086f264eb4afe1418f3a4" ]; then
+if [ $(md5sum freeciv | awk '{print $1}') != "2d3df0051726f87c11795b7292c332fc" ]; then
: check that split out contrib/freeciv-{client,server} are ok and update md5sum
exit 1
fi
@@ -71,7 +81,7 @@
mv contrib/munin-node .
%{__sed} -ne '1,/complete -F _munin-update munin-update/p' munin-node > contrib/munin
%{__sed} -ne '1,3p;/munin-node-configure/,$p' munin-node > contrib/munin-node
-if [ $(md5sum munin-node | awk '{print $1}') != "c51fd6354ee73c1bf34915bc4aaa3856" ]; then
+if [ $(md5sum munin-node | awk '{print $1}') != "05a418afed08983a852145e472d5b2e9" ]; then
: check that split out contrib/munin{,-node} are ok and update md5sum
exit 1
fi
@@ -165,6 +175,11 @@
%{nil}
%bashcomp_trigger ant
+%bashcomp_trigger apt
+%bashcomp_trigger aptitude
+%bashcomp_trigger aspell
+%bashcomp_trigger autorpm
+%bashcomp_trigger bash bash-builtins
%bashcomp_trigger bind-utils
%bashcomp_trigger bitkeeper
%bashcomp_trigger BitTorrent bittorrent
@@ -173,33 +188,50 @@
%bashcomp_trigger bzip2
%bashcomp_trigger cdrkit,cdrtools wodim
%bashcomp_trigger cdrtools-mkisofs,dvdrtools-mkisofs genisoimage
+%bashcomp_trigger chkconfig
%bashcomp_trigger cksfv
%bashcomp_trigger clisp
%bashcomp_trigger coreutils dd
%bashcomp_trigger cpio
+%bashcomp_trigger cups-clients cups
+%bashcomp_trigger cvsnt,cvs cvs
%bashcomp_trigger dhcp-client dhclient
+%bashcomp_trigger dict
+%bashcomp_trigger dpkg
%bashcomp_trigger dsniff
+%bashcomp_trigger expat xmlwf
%bashcomp_trigger findutils
%bashcomp_trigger freeciv-client
%bashcomp_trigger freeciv-server
%bashcomp_trigger gcc-ada gnatmake
+%bashcomp_trigger gcc,gcc-java,fortran,gcc-c++ gcc
%bashcomp_trigger gcl
%bashcomp_trigger gdb
%bashcomp_trigger gkrellm
+%bashcomp_trigger glibc iconv
%bashcomp_trigger glibc-misc getent
%bashcomp_trigger gnupg2 gpg2
+%bashcomp_trigger gnupg gpg
%bashcomp_trigger gzip
%bashcomp_trigger heimdal
%bashcomp_trigger ImageMagick imagemagick
+%bashcomp_trigger info,pinfo info
+%bashcomp_trigger iptables
+%bashcomp_trigger jar
+%bashcomp_trigger java-sun-jre,java-gcj-compat java
+%bashcomp_trigger kdelibs dcop
%bashcomp_trigger ldapvi
%bashcomp_trigger lftp
%bashcomp_trigger libxml2-progs xmllint
+%bashcomp_trigger lilo
%bashcomp_trigger lilypond
+%bashcomp_trigger links
%bashcomp_trigger lvm2 lvm
%bashcomp_trigger lzma,xz lzma
%bashcomp_trigger lzop
%bashcomp_trigger mailman
%bashcomp_trigger make
+%bashcomp_trigger man
%bashcomp_trigger mc
%bashcomp_trigger mcrypt
%bashcomp_trigger minicom
@@ -208,6 +240,7 @@
%bashcomp_trigger multisync-msynctool,msynctool msynctool
%bashcomp_trigger munin
%bashcomp_trigger munin-node
+%bashcomp_trigger mutt
%bashcomp_trigger mysql-client mysqladmin
%bashcomp_trigger ncftp
%bashcomp_trigger net-tools
@@ -216,16 +249,25 @@
%bashcomp_trigger openldap
%bashcomp_trigger openssh-clients ssh
%bashcomp_trigger openssl-tools openssl
+%bashcomp_trigger pcmciautils cardctl
+%bashcomp_trigger perl-base perl
+%bashcomp_trigger pine
%bashcomp_trigger pkgconfig pkg-config
%bashcomp_trigger poldek
%bashcomp_trigger postfix
%bashcomp_trigger postgresql-clients postgresql
%bashcomp_trigger povray
+%bashcomp_trigger procps sysctl
%bashcomp_trigger pwdutils shadow
+%bashcomp_trigger pwdutils,shadow-extras chsh
+%bashcomp_trigger python
%bashcomp_trigger qemu
%bashcomp_trigger QtDBus qdbus
%bashcomp_trigger quota-tools
+%bashcomp_trigger rcs
%bashcomp_trigger rdesktop
+%bashcomp_trigger rpm
+%bashcomp_trigger rrdtool
%bashcomp_trigger rsync
%bashcomp_trigger ruby-modules ri
%bashcomp_trigger samba-client samba
@@ -237,15 +279,21 @@
%bashcomp_trigger strace
%bashcomp_trigger svk
%bashcomp_trigger tar
+%bashcomp_trigger tcpdump
%bashcomp_trigger tightvnc vncviewer
%bashcomp_trigger unace
%bashcomp_trigger unixODBC isql
%bashcomp_trigger unrar
%bashcomp_trigger upstart-SysVinit,SysVinit sysvinit
%bashcomp_trigger vpnc
+%bashcomp_trigger wireless-tools
+%bashcomp_trigger wvdial
%bashcomp_trigger X11,xorg-app-xhost xhost
+%bashcomp_trigger X11,xorg-app-xrandr xrandr
%bashcomp_trigger xen xm
%bashcomp_trigger xmms
+%bashcomp_trigger xz
+%bashcomp_trigger yp-tools
%bashcomp_trigger yum
%files -f %{name}-ghost.list
@@ -257,40 +305,63 @@
%dir %{_datadir}/%{name}
# we list all files to be sure we have all of them handled by triggers
%{_datadir}/%{name}/ant
+%{_datadir}/%{name}/apt
+%{_datadir}/%{name}/aptitude
+%{_datadir}/%{name}/aspell
+%{_datadir}/%{name}/autorpm
+%{_datadir}/%{name}/bash-builtins
%{_datadir}/%{name}/bind-utils
%{_datadir}/%{name}/bitkeeper
%{_datadir}/%{name}/bittorrent
%{_datadir}/%{name}/bluez-utils
%{_datadir}/%{name}/brctl
%{_datadir}/%{name}/bzip2
+%{_datadir}/%{name}/cardctl
+%{_datadir}/%{name}/chkconfig
+%{_datadir}/%{name}/chsh
%{_datadir}/%{name}/cksfv
%{_datadir}/%{name}/clisp
%{_datadir}/%{name}/cpio
+%{_datadir}/%{name}/cups
+%{_datadir}/%{name}/cvs
+%{_datadir}/%{name}/dcop
%{_datadir}/%{name}/dd
%{_datadir}/%{name}/dhclient
+%{_datadir}/%{name}/dict
+%{_datadir}/%{name}/dpkg
%{_datadir}/%{name}/dsniff
%{_datadir}/%{name}/findutils
%{_datadir}/%{name}/freeciv-client
%{_datadir}/%{name}/freeciv-server
+%{_datadir}/%{name}/gcc
%{_datadir}/%{name}/gcl
%{_datadir}/%{name}/gdb
%{_datadir}/%{name}/genisoimage
%{_datadir}/%{name}/getent
%{_datadir}/%{name}/gkrellm
%{_datadir}/%{name}/gnatmake
+%{_datadir}/%{name}/gpg
%{_datadir}/%{name}/gpg2
%{_datadir}/%{name}/gzip
%{_datadir}/%{name}/heimdal
+%{_datadir}/%{name}/iconv
%{_datadir}/%{name}/imagemagick
+%{_datadir}/%{name}/info
+%{_datadir}/%{name}/iptables
%{_datadir}/%{name}/isql
+%{_datadir}/%{name}/jar
+%{_datadir}/%{name}/java
%{_datadir}/%{name}/ldapvi
%{_datadir}/%{name}/lftp
+%{_datadir}/%{name}/lilo
%{_datadir}/%{name}/lilypond
+%{_datadir}/%{name}/links
%{_datadir}/%{name}/lvm
%{_datadir}/%{name}/lzma
%{_datadir}/%{name}/lzop
%{_datadir}/%{name}/mailman
%{_datadir}/%{name}/make
+%{_datadir}/%{name}/man
%{_datadir}/%{name}/mc
%{_datadir}/%{name}/mcrypt
%{_datadir}/%{name}/minicom
@@ -299,23 +370,30 @@
%{_datadir}/%{name}/mtx
%{_datadir}/%{name}/munin
%{_datadir}/%{name}/munin-node
+%{_datadir}/%{name}/mutt
%{_datadir}/%{name}/mysqladmin
%{_datadir}/%{name}/ncftp
%{_datadir}/%{name}/net-tools
%{_datadir}/%{name}/ntpdate
%{_datadir}/%{name}/openldap
%{_datadir}/%{name}/openssl
+%{_datadir}/%{name}/perl
+%{_datadir}/%{name}/pine
%{_datadir}/%{name}/pkg-config
%{_datadir}/%{name}/poldek
%{_datadir}/%{name}/postfix
%{_datadir}/%{name}/postgresql
%{_datadir}/%{name}/povray
+%{_datadir}/%{name}/python
%{_datadir}/%{name}/qdbus
%{_datadir}/%{name}/qemu
%{_datadir}/%{name}/quota-tools
+%{_datadir}/%{name}/rcs
%{_datadir}/%{name}/rdesktop
%{_datadir}/%{name}/ri
%{_datadir}/%{name}/rpcdebug
+%{_datadir}/%{name}/rpm
+%{_datadir}/%{name}/rrdtool
%{_datadir}/%{name}/rsync
%{_datadir}/%{name}/samba
%{_datadir}/%{name}/sbcl
@@ -327,17 +405,25 @@
%{_datadir}/%{name}/ssh
%{_datadir}/%{name}/strace
%{_datadir}/%{name}/svk
+%{_datadir}/%{name}/sysctl
%{_datadir}/%{name}/sysvinit
%{_datadir}/%{name}/tar
+%{_datadir}/%{name}/tcpdump
%{_datadir}/%{name}/unace
%{_datadir}/%{name}/unrar
%{_datadir}/%{name}/vncviewer
%{_datadir}/%{name}/vpnc
+%{_datadir}/%{name}/wireless-tools
%{_datadir}/%{name}/wodim
+%{_datadir}/%{name}/wvdial
%{_datadir}/%{name}/xhost
%{_datadir}/%{name}/xm
%{_datadir}/%{name}/xmllint
+%{_datadir}/%{name}/xmlwf
%{_datadir}/%{name}/xmms
+%{_datadir}/%{name}/xrandr
+%{_datadir}/%{name}/xz
+%{_datadir}/%{name}/yp-tools
%{_datadir}/%{name}/yum
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -346,6 +432,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.150 2009/07/21 04:45:43 glen
+- update to new snap
+
Revision 1.149 2009/05/23 22:14:15 glen
- skip sed run for ps output filtering
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion-rpm-cache.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion.spec?r1=1.149&r2=1.150&f=u
More information about the pld-cvs-commit
mailing list