Author: glen Date: Wed Mar 1 20:09:18 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - split and rediff patches for easier upstream merge - move initialization script to SOURCES
---- Files affected: SPECS: bash-completion.spec (1.129 -> 1.130) ---- Diffs: ================================================================ Index: SPECS/bash-completion.spec diff -u SPECS/bash-completion.spec:1.129 SPECS/bash-completion.spec:1.130 --- SPECS/bash-completion.spec:1.129 Wed Mar 1 20:43:35 2006 +++ SPECS/bash-completion.spec Wed Mar 1 21:09:12 2006 @@ -9,8 +9,10 @@ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 # Source0-md5: ed95a89f57357a42b8e4eb95487bf9d0 Source1: %{name}-poldek.sh -Patch0: %{name}-FHS.patch +Source2: %{name}.sh +Patch0: %{name}-rpm-cache.patch Patch1: %{name}-rpm-arch.patch +Patch2: %{name}-FHS.patch URL: http://www.caliban.org/bash/ Requires(triggerpostun): sed >= 4.0 Requires: bash >= 2.05a-3 @@ -31,24 +33,7 @@ %setup -q -n bash_completion %patch0 -p1 %patch1 -p1 - -cat <<'EOF' > %{name}.sh -# check for bash -[ -z "$BASH_VERSION" ] && return - -# must be interactive shell, not script -[[ $- = *i* ]] || return - -# check for correct version of bash -bash=${BASH_VERSION%%.*}; bmajor=${bash%%.*}; bminor=${bash#*.} -if [ "$bmajor" -eq 2 -a "$bminor" '>' 04 ] || [ "$bmajor" -gt 2 ]; then - if [ "$PS1" ]; then # interactive shell - # Source completion code - . %{_sysconfdir}/bash_completion - fi -fi -unset bash bminor bmajor -EOF +%patch2 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -58,7 +43,7 @@ install contrib/* $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d > $RPM_BUILD_ROOT/var/cache/rpmpkgs.txt install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/poldek -install %{name}.sh $RPM_BUILD_ROOT/etc/shrc.d +install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d %clean rm -rf $RPM_BUILD_ROOT @@ -95,6 +80,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.130 2006/03/01 20:09:12 glen +- split and rediff patches for easier upstream merge +- move initialization script to SOURCES + Revision 1.129 2006/03/01 19:43:35 glen - updated to 20060301 - subversion completion integrated into main file ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bash-completion.spec?r1=1.129&r2=1.130&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
