packages: bash-completion/bash-completion-rpm-cache.patch, bash-completion/...
glen
glen at pld-linux.org
Sun Oct 11 16:28:05 CEST 2009
Author: glen Date: Sun Oct 11 14:28:05 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.1-release
---- Files affected:
packages/bash-completion:
bash-completion-rpm-cache.patch (1.9 -> 1.10) , bash-completion.spec (1.153 -> 1.154) , bash-completion-psheader.patch (1.2 -> NONE) (REMOVED), bash-completion-service.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/bash-completion/bash-completion-rpm-cache.patch
diff -u packages/bash-completion/bash-completion-rpm-cache.patch:1.9 packages/bash-completion/bash-completion-rpm-cache.patch:1.10
--- packages/bash-completion/bash-completion-rpm-cache.patch:1.9 Thu Sep 17 22:33:56 2009
+++ packages/bash-completion/bash-completion-rpm-cache.patch Sun Oct 11 16:27:59 2009
@@ -4,40 +4,29 @@
--
Signed-off-by: Elan Ruusamäe <glen at delfi.ee>
---- 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()
+--- bash-completion-1.1/contrib/rpm~ 2009-10-09 15:49:31.000000000 +0300
++++ bash-completion-1.1/contrib/rpm 2009-10-10 23:49:53.931350555 +0300
+@@ -7,15 +7,21 @@
{
-- local ver nodig="$1" nosig="$2"
-+ local nodig="$1" nosig="$2"
-+
-+ # 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.
-+ if [ -w /var/log/rpmpkgs -a /var/log/rpmpkgs -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/log/rpmpkgs
-+ fi
+ local nodig="$1" nosig="$2"
- 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' \
-+ 's|^\('$cur'.*\)\.rpm$|\1|p' \
- /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*" ) )
- fi
++ # 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
++
+ 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' \
++ 's|^\('$cur'.*\)\.rpm$|\1|p' \
+ /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*" ) )
+ fi
}
================================================================
Index: packages/bash-completion/bash-completion.spec
diff -u packages/bash-completion/bash-completion.spec:1.153 packages/bash-completion/bash-completion.spec:1.154
--- packages/bash-completion/bash-completion.spec:1.153 Thu Sep 17 22:24:53 2009
+++ packages/bash-completion/bash-completion.spec Sun Oct 11 16:27:59 2009
@@ -5,24 +5,19 @@
# - use mkinitrd and update for geninitrd
# - can we have duplicate trigger on pwdutils pkg? merge files?
# - fix vim not to mark this file as bash
-%define snap 20090917
-%define rel 0.4
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.%{snap}.%{rel}
+Version: 1.1
+Release: 1
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: ab8de6cd1b8c921ec6aa0b641364e4d0
+Source0: http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
+# Source0-md5: 593d3edcf287b9e9d735049bd4d3f229
Source1: %{name}-poldek.sh
Source2: %{name}.sh
Patch0: %{name}-rpm-cache.patch
-Patch1: %{name}-service.patch
-Patch2: %{name}-psheader.patch
URL: http://bash-completion.alioth.debian.org/
Requires(triggerpostun): sed >= 4.0
Requires: bash >= 2.05a-3
@@ -41,15 +36,10 @@
kompletowanie parametrów linii poleceń.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -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
@@ -62,7 +52,7 @@
rm contrib/apache2ctl
# No PLD package or no such binary to complete on
-rm contrib/{harbour,larch,lisp,modules,monodevelop,p4,cowsay,cpan2dist}
+rm contrib/{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}
@@ -72,18 +62,18 @@
# 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}') != "2d3df0051726f87c11795b7292c332fc" ]; then
+%{__sed} -ne '/civserver completion/,/complete -F _civserver civserver/p;/# Local/,/# ex:/p' freeciv > contrib/freeciv-server
+%{__sed} -ne '/civclient completion/,/complete -F _civclient civclient/p;/# Local/,/# ex:/p' freeciv > contrib/freeciv-client
+if [ $(md5sum freeciv | awk '{print $1}') != "aaaba09338c01cf3c14bbd1bdcb0897f" ]; then
: check that split out contrib/freeciv-{client,server} are ok and update md5sum
exit 1
fi
# split munin as we have subpackage for node
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}') != "05a418afed08983a852145e472d5b2e9" ]; then
+%{__sed} -ne '1,2p;/have munin-update /,/complete -F _munin-update/p;/have munin-run /,/complete -F _munin-run/p;/# Local/,/# ex:/p' munin-node > contrib/munin
+%{__sed} -ne '1,2p;/have munin-node-configure /,/complete -F _munin-node-configure/p;/# Local/,/# ex:/p' munin-node > contrib/munin-node
+if [ $(md5sum munin-node | awk '{print $1}') != "78a95bb707452778355af992e8fe30fa" ]; then
: check that split out contrib/munin{,-node} are ok and update md5sum
exit 1
fi
@@ -91,8 +81,8 @@
# we have lastlog in sysvinit package
mv contrib/shadow .
%{__sed} -ne '1,/complete -F _faillog faillog/p' shadow > contrib/shadow
-%{__sed} -ne '1,3p;/lastlog/,$p' shadow > contrib/sysvinit
-if [ $(md5sum shadow | awk '{print $1}') != "4dfef3151921fd9644566a3244038f85" ]; then
+%{__sed} -ne '1,2p;/have lastlog/,$p' shadow > contrib/sysvinit
+if [ $(md5sum shadow | awk '{print $1}') != "c62642a786329aa07702b0c09965a9e8" ]; then
: check that split out contrib/{shadow,sysvinit} are ok and update md5sum
exit 1
fi
@@ -125,7 +115,7 @@
cp -a bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
cp -a contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d
# Take care of contrib files
for a in contrib/*; do
@@ -227,7 +217,6 @@
%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
@@ -271,6 +260,7 @@
%bashcomp_trigger rcs
%bashcomp_trigger rdesktop
%bashcomp_trigger resolvconf
+%bashcomp_trigger rfkill
%bashcomp_trigger rpm
%bashcomp_trigger rrdtool
%bashcomp_trigger rsync
@@ -361,7 +351,6 @@
%{_datadir}/%{name}/ldapvi
%{_datadir}/%{name}/lftp
%{_datadir}/%{name}/lilo
-%{_datadir}/%{name}/lilypond
%{_datadir}/%{name}/links
%{_datadir}/%{name}/lvm
%{_datadir}/%{name}/lzma
@@ -399,6 +388,7 @@
%{_datadir}/%{name}/rcs
%{_datadir}/%{name}/rdesktop
%{_datadir}/%{name}/resolvconf
+%{_datadir}/%{name}/rfkill
%{_datadir}/%{name}/ri
%{_datadir}/%{name}/rpcdebug
%{_datadir}/%{name}/rpm
@@ -442,6 +432,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.154 2009/10/11 14:27:59 glen
+- up to 1.1-release
+
Revision 1.153 2009/09/17 20:24:53 glen
- -mplayer.patch is useless there already is fl[iv]|FL[IV] (hanska)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion-rpm-cache.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion.spec?r1=1.153&r2=1.154&f=u
More information about the pld-cvs-commit
mailing list