- cosmetics.

Changed files:
    bash-completion.spec -> 1.20

diff --git a/bash-completion.spec b/bash-completion.spec
index 0776fd3149a6469da2260b08898314d253f68b20..d6bf55436ffb7ba2a5b5168d184bb8b6df203984 100644 (file)
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -1,38 +1,36 @@
-%define bashversion 2.05a
-Summary:       bash-completion offers programmable completion for bash %{bashversion}
-Summary(pl):   Programowalne uzupe³nianie nazw dla basha %{bashversion}
+Summary:       bash-completion offers programmable completion for bash
+Summary(pl):   Programowalne uzupe³nianie nazw dla basha
 Name:          bash-completion
 Version:       20020507
 Release:       1
-Group:         Applications/Shells
 License:       GPL
+Group:         Applications/Shells
 Source0:       http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 URL:           http://www.caliban.org/bash/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-BuildArch:     noarch
-Requires:      bash >= %{bashversion}-3
 Requires(post):        grep
 Requires(postun):      sed
+BuildArch:     noarch
+Requires:      bash >= 2.05a-3
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 bash-completion is a collection of shell functions that take advantage
-of the programmable completion feature of bash 2.04 and later. To use
-this collection, you ideally need bash 2.05a or later.
+of the programmable completion feature of bash 2.04 and later.
 
 %description -l pl
 bash-completion jest kolekcj± funkcji shella, które opieraj± siê na
-wbudowanych rozszerzeniach basha 2.04 lub pó¼niejszego. Aby u¿ywaæ tej
-kolekcji, potrzebujesz basha 2.05a lub pó¼niejszego.
+wbudowanych rozszerzeniach basha 2.04 lub pó¼niejszego umo¿liwiaj±cego
+kompletowanie parametrów linii poleceñ.
 
 %prep
 %setup -q -n bash_completion
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-install bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
+install bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
+
 gzip -9nf README Changelog
 
 %clean
@@ -40,12 +38,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if ! grep -q '\[ -f '%{_sysconfdir}'/bash_completion \]' \
-     %{_sysconfdir}/bashrc 2>/dev/null; then
-    cat <<'EOF' >> %{_sysconfdir}/bashrc
+       %{_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
+       && [ -f %{_sysconfdir}/bash_completion ]; then  # interactive shell
        # Source completion code
         . %{_sysconfdir}/bash_completion
 fi
@@ -56,13 +54,13 @@ fi
 
 %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
+       sed -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc \
+               > /etc/bashrc.tmp
+       mv -f /etc/bashrc.tmp /etc/bashrc
 fi
 
 %files
 %defattr(644,root,root,755)
+%doc *.gz  contrib/
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d/
-%doc *.gz  contrib/