Author: glen Date: Wed Feb 9 17:35:07 2011 GMT Module: packages Tag: HEAD ---- Log message: - prepare for bash-completion-1.3
---- Files affected: packages/bash-completion: bash-completion-rpm-cache.patch (1.11 -> 1.12) , bash-completion.spec (1.162 -> 1.163) , pear.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/bash-completion/bash-completion-rpm-cache.patch diff -u packages/bash-completion/bash-completion-rpm-cache.patch:1.11 packages/bash-completion/bash-completion-rpm-cache.patch:1.12 --- packages/bash-completion/bash-completion-rpm-cache.patch:1.11 Mon Aug 9 20:54:10 2010 +++ packages/bash-completion/bash-completion-rpm-cache.patch Wed Feb 9 18:35:02 2011 @@ -1,10 +1,12 @@ Support rpm (jbj rpm 4.4.7+) hrmib exports for rpm -qa filter (via %_hrmib_path /var/cache/hrmib) +Not accepted upstream. + -- Signed-off-by: Elan Ruusamäe <[email protected]> ---- bash-completion-1.2/contrib/rpm~ 2010-06-13 13:21:19.000000000 +0300 -+++ bash-completion-1.2/contrib/rpm 2010-08-09 21:52:51.377872623 +0300 +--- bash-completion-1.2/completions/rpm~ 2010-06-13 13:21:19.000000000 +0300 ++++ bash-completion-1.2/completions/rpm 2010-08-09 21:52:51.377872623 +0300 @@ -5,6 +5,12 @@ _rpm_installed_packages() ================================================================ Index: packages/bash-completion/bash-completion.spec diff -u packages/bash-completion/bash-completion.spec:1.162 packages/bash-completion/bash-completion.spec:1.163 --- packages/bash-completion/bash-completion.spec:1.162 Tue Oct 19 21:55:32 2010 +++ packages/bash-completion/bash-completion.spec Wed Feb 9 18:35:02 2011 @@ -8,13 +8,13 @@ Summary: bash-completion offers programmable completion for bash Summary(pl.UTF-8): Programowalne uzupełnianie nazw dla basha Name: bash-completion -Version: 1.2 -Release: 4 +Version: 1.3 +Release: 0.1 Epoch: 1 License: GPL Group: Applications/Shells -Source0: http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz -# Source0-md5: 457c8808ed54f2b2cdd737b1f37ffa24 +Source0: http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.bz2 +# Source0-md5: a1262659b4bbf44dc9e59d034de505ec Source1: %{name}-poldek.sh Source2: %{name}.sh # https://bugs.launchpad.net/ubuntu/+source/mysql-dfsg-5.0/+bug/106975 @@ -26,7 +26,7 @@ Patch1: pear.patch URL: http://bash-completion.alioth.debian.org/ Requires(triggerpostun): sed >= 4.0 -Requires: bash >= 2.05a-3 +Requires: bash >= 3.2 Requires: issue Obsoletes: bash-completion-rpm-cache Conflicts: rpm < 4.4.9-44 @@ -44,9 +44,9 @@ %prep %setup -q -cp -a %{SOURCE1} contrib/poldek -cp -a %{SOURCE3} contrib/mysqldump -cp -a %{SOURCE4} contrib/pear +cp -a %{SOURCE1} completions/poldek +cp -a %{SOURCE3} completions/mysqldump +cp -a %{SOURCE4} completions/pear %patch0 -p1 %patch1 -p1 @@ -54,47 +54,47 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f # packaged by subversion.spec -rm contrib/_subversion +rm completions/_subversion # soon packaged by yum, but not yet -mv contrib/{_,}yum -mv contrib/{_,}yum-utils +mv completions/{_,}yum +mv completions/{_,}yum-utils # No package matches '*/apache2ctl' -rm contrib/apache2ctl +rm completions/apache2ctl # No PLD package or no such binary to complete on -rm contrib/{larch,lisp,_modules,monodevelop,p4,cowsay,cpan2dist} -rm contrib/{cfengine,mkinitrd,rpmcheck} -rm contrib/{kldload,pkg_install,portupgrade,pkgtools} # FreeBSD Stuff -rm contrib/{apt-build,dselect,_mock,reportbug,sysv-rc,update-alternatives,lintian} +rm completions/{larch,lisp,_modules,monodevelop,p4,cowsay,cpan2dist} +rm completions/{cfengine,mkinitrd,rpmcheck} +rm completions/{kldload,pkg_install,portupgrade,pkgtools} # FreeBSD Stuff +rm completions/{apt-build,dselect,_mock,reportbug,sysv-rc,update-alternatives,lintian} # no package to hook to -rm contrib/configure +rm completions/configure # split freeciv-client,freeciv-server as we have these in separate packages -mv contrib/freeciv . -%{__sed} -ne '1,2p;/have civserver/,/complete -F _civserver civserver/p;/# Local/,/# ex:/p' freeciv > contrib/freeciv-server -%{__sed} -ne '1,2p;/have civclient/,/complete -F _civclient civclient/p;/# Local/,/# ex:/p' freeciv > contrib/freeciv-client +mv completions/freeciv . +%{__sed} -ne '1,2p;/have civserver/,/complete -F _civserver civserver/p;/# Local/,/# ex:/p' freeciv > completions/freeciv-server +%{__sed} -ne '1,2p;/have civclient/,/complete -F _civclient civclient/p;/# Local/,/# ex:/p' freeciv > completions/freeciv-client if [ $(md5sum freeciv | awk '{print $1}') != "7e3549ec737e9eef01305ad941d5e8b6" ]; then - : check that split out contrib/freeciv-{client,server} are ok and update md5sum + : check that split out completions/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,2p;/have munin-run/,/complete -F _munin_update/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 +mv completions/munin-node . +%{__sed} -ne '1,2p;/have munin-run/,/complete -F _munin_update/p;/# Local/,/# ex:/p' munin-node > completions/munin +%{__sed} -ne '1,2p;/have munin-node-configure /,/complete -F _munin_node_configure/p;/# Local/,/# ex:/p' munin-node > completions/munin-node if [ $(md5sum munin-node | awk '{print $1}') != "0f7b9278eafe5b822a18c1bc7cc2e026" ]; then - : check that split out contrib/munin{,-node} are ok and update md5sum + : check that split out completions/munin{,-node} are ok and update md5sum exit 1 fi -# we have lastlog in sysvinit package -mv contrib/shadow . -%{__sed} -ne '1,/complete -F _faillog faillog/p;/# Local/,/# ex:/p' shadow > contrib/shadow -%{__sed} -ne '1,2p;/have lastlog/,$p' shadow > contrib/sysvinit -if [ $(md5sum shadow | awk '{print $1}') != "1e54016f614554139cb910defceda1f3" ]; then - : check that split out contrib/{shadow,sysvinit} are ok and update md5sum +# split out 'lastlog' to completions/sysvinit +mv completions/shadow . +%{__sed} -ne '1,2p;/have useradd/,/complete -F _faillog/p;/# Local/,/# ex:/p' shadow > completions/shadow +%{__sed} -ne '1,2p;/have lastlog/,$p' shadow > completions/sysvinit +if [ $(md5sum shadow | awk '{print $1}') != "f4ad6e6db21703b802e6be3902a63b99" ]; then + : check that split out completions/{shadow,sysvinit} are ok and update md5sum exit 1 fi @@ -123,11 +123,11 @@ [ "$err" != 0 ] && exit $err cp -a bash_completion $RPM_BUILD_ROOT%{_sysconfdir} -cp -a contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -a completions/* $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d -# Take care of contrib files -for a in contrib/*; do +# Take care of completions files +for a in completions/*; do f=${a##*/} ln -s ../..%{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d echo "%ghost %{_sysconfdir}/bash_completion.d/$f" @@ -334,7 +334,8 @@ %files -f %{name}-ghost.list %defattr(644,root,root,755) -%doc README TODO +%doc AUTHORS CHANGES README TODO + /etc/shrc.d/%{name}.sh %{_sysconfdir}/bash_completion %dir %{_sysconfdir}/bash_completion.d @@ -497,6 +498,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.163 2011/02/09 17:35:02 glen +- prepare for bash-completion-1.3 + Revision 1.162 2010/10/19 19:55:32 glen - add PEAR_Command_Packaging support to pear ================================================================ Index: packages/bash-completion/pear.patch diff -u packages/bash-completion/pear.patch:1.1 packages/bash-completion/pear.patch:1.2 --- packages/bash-completion/pear.patch:1.1 Tue Oct 19 21:55:32 2010 +++ packages/bash-completion/pear.patch Wed Feb 9 18:35:02 2011 @@ -1,5 +1,5 @@ ---- bash-completion-1.2/contrib/pear~ 2010-08-23 20:41:58.000000000 +0300 -+++ bash-completion-1.2/contrib/pear 2010-10-19 22:52:26.008412279 +0300 +--- bash-completion-1.2/completions/pear~ 2010-08-23 20:41:58.000000000 +0300 ++++ bash-completion-1.2/completions/pear 2010-10-19 22:52:26.008412279 +0300 @@ -106,6 +106,13 @@ _filedir '@(tgz)' return 0 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion-rpm-cache.patch?r1=1.11&r2=1.12&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion.spec?r1=1.162&r2=1.163&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/pear.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
