- split and rediff patches for easier upstream merge

[packages/bash-completion.git] / bash-completion.spec

diff --git a/bash-completion.spec b/bash-completion.spec
index 0337f39ecdc726e2d726c4ab32aa5a54e5ef382a..9d5fa326afc7986afc01581f7843e90d34085684 100644 (file)
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -1,16 +1,20 @@
 Summary:       bash-completion offers programmable completion for bash
 Summary(pl):   Programowalne uzupe³nianie nazw dla basha
 Name:          bash-completion
-Version:       20020803
+Version:       20060301
 Release:       1
 License:       GPL
 Group:         Applications/Shells
 Source0:       http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
+# Source0-md5: ed95a89f57357a42b8e4eb95487bf9d0
+Source1:       %{name}-poldek.sh
+Patch0:                %{name}-FHS.patch
+Patch1:                %{name}-rpm-arch.patch
 URL:           http://www.caliban.org/bash/
-Requires(post):        grep
-Requires(postun):      sed
-BuildArch:     noarch
+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)
 
 %description
@@ -24,43 +28,62 @@ kompletowanie parametr
 
 %prep
 %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
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+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
+> $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if ! grep -q '\[ -f '%{_sysconfdir}'/bash_completion \]' \
-       %{_sysconfdir}/bashrc 2>/dev/null; then
-               cat <<'EOF' >> %{_sysconfdir}/bashrc
-# START bash completion -- do not remove this line
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ "$PS1" ] && [ "$bmajor" -eq 2 ] && [ "$bminor" '>' 04 ] \
-       && [ -f %{_sysconfdir}/bash_completion ]; then  # interactive shell
-       # Source completion code
-        . %{_sysconfdir}/bash_completion
-fi
-unset bash bmajor bminor
-# END bash completion -- do not remove this line
-EOF
-fi
+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
 
-%postun
-if [ "$1" -eq 0 ]; then
-       sed -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc \
-               > /etc/bashrc.tmp
-       mv -f /etc/bashrc.tmp /etc/bashrc
+       # 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
-chmod 644 /etc/bashrc
+
+%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)
-%doc README Changelog contrib
+%doc README Changelog BUGS
 %{_sysconfdir}/bash_completion
-%dir %{_sysconfdir}/bash_completion.d/
+%{_sysconfdir}/bash_completion.d
+%attr(755,root,root) /etc/shrc.d/%{name}.sh
+%ghost %attr(664,root,wheel) /var/cache/rpmpkgs.txt