Author: glen Date: Wed Feb 22 19:01:25 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - drop -rpm-cache package (on demand caching in main code) - rel 4, STBR
---- Files affected: SPECS: bash-completion.spec (1.127 -> 1.128) ---- Diffs: ================================================================ Index: SPECS/bash-completion.spec diff -u SPECS/bash-completion.spec:1.127 SPECS/bash-completion.spec:1.128 --- SPECS/bash-completion.spec:1.127 Wed Jan 18 01:06:44 2006 +++ SPECS/bash-completion.spec Wed Feb 22 20:01:20 2006 @@ -3,13 +3,12 @@ Summary(pl): Programowalne uzupełnianie nazw dla basha Name: bash-completion Version: 20050721 -Release: 3.3 +Release: 4 License: GPL Group: Applications/Shells Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 # Source0-md5: 4de9f0dee0663f08b5e24f64490e642e -Source1: %{name}.cron -Source2: %{name}-poldek.sh +Source1: %{name}-poldek.sh Patch0: %{name}-FHS.patch Patch1: %{name}-ifcfg.patch Patch2: %{name}-known_hosts.patch @@ -17,6 +16,7 @@ URL: http://www.caliban.org/bash/ Requires(triggerpostun): sed >= 4.0 Requires: bash >= 2.05a-3 +Obsoletes: bash-completion-rpm-cache BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -29,19 +29,6 @@ wbudowanych rozszerzeniach basha 2.04 lub późniejszego umożliwiającego kompletowanie parametrów linii poleceń. -%package rpm-cache -Summary: Cache result of rpm -qa -Summary(pl): Buforowanie wyniku rpm -qa -Group: Applications/Shells - -%description rpm-cache -This package contains cached version of rpm -qa, which is used for rpm -completion for faster completion. - -%description rpm-cache -l pl -Ten pakiet zawiera skrypt buforujący wynik rpm -qa w celu szybszego -dopełniania linii poleceń programu rpm. - %prep %setup -q -n bash_completion %patch0 -p1 @@ -51,15 +38,14 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir}/bash_completion.d,/etc/cron.daily,/etc/shrc.d,/var/cache} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/bash_completion.d,/etc/shrc.d,/var/cache} install bash_completion $RPM_BUILD_ROOT%{_sysconfdir} install contrib/* $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily/rpmpkgs > $RPM_BUILD_ROOT/var/cache/rpmpkgs.txt -install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/poldek +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/poldek # subversion comes with much better completion file rm $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/subversion @@ -86,16 +72,23 @@ %clean rm -rf $RPM_BUILD_ROOT -%post rpm-cache +%post if [ ! -f /var/cache/rpmpkgs.txt ]; then touch /var/cache/rpmpkgs.txt chown root:wheel /var/cache/rpmpkgs.txt chmod 664 /var/cache/rpmpkgs.txt + + # rpm binary check for vservers + if [ -x /bin/rpm ]; then + export LC_ALL=C + rpm -qa --qf '%%{name}-%%{version}-%%{release}.%%{arch}.rpm\n' 2>&1 | sort > /var/cache/rpmpkgs.txt + fi fi -%triggerpostun -- %{name} < 20050112-1 -# legacy clean-up +%triggerpostun -- %{name} < 20050721-3.9 sed -i -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc +chown root:wheel /var/cache/rpmpkgs.txt +chmod 664 /var/cache/rpmpkgs.txt %files %defattr(644,root,root,755) @@ -103,10 +96,6 @@ %{_sysconfdir}/bash_completion %{_sysconfdir}/bash_completion.d %attr(755,root,root) /etc/shrc.d/%{name}.sh - -%files rpm-cache -%defattr(644,root,root,755) -%attr(755,root,root) /etc/cron.daily/* %ghost %attr(664,root,wheel) /var/cache/rpmpkgs.txt %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -115,6 +104,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.128 2006/02/22 19:01:20 glen +- drop -rpm-cache package (on demand caching in main code) +- rel 4, STBR + Revision 1.127 2006/01/18 00:06:44 glen - add arch to rpm pkglist completion output ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bash-completion.spec?r1=1.127&r2=1.128&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
