From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 29 Dec 2002 01:44:29 +0000 (+0000)
Subject: - umask in scripts, other fixes/cosmetics where needed
X-Git-Tag: bash-completion-20030113-1~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=de31943dcb996a32d43c633d303fa5e165e7c4e3;p=packages%2Fbash-completion.git

- umask in scripts, other fixes/cosmetics where needed

Changed files:
    bash-completion.spec -> 1.61
---

diff --git a/bash-completion.spec b/bash-completion.spec
index c4ab0c8..bc9ef08 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -7,7 +7,10 @@ License:	GPL
 Group:		Applications/Shells
 Source0:	http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 URL:		http://www.caliban.org/bash/
+Requires(post,preun):	bash
 Requires(post):	grep
+Requires(post):	textutils
+Requires(postun):	fileutils
 Requires(postun):	sed
 BuildArch:	noarch
 Requires:	bash >= 2.05a-3
@@ -31,20 +34,20 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 install bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 if ! grep -q '\[ -f '%{_sysconfdir}'/bash_completion \]' \
 	%{_sysconfdir}/bashrc 2>/dev/null; then
+		umask 022
 		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
+	. %{_sysconfdir}/bash_completion
 fi
 unset bash bmajor bminor
 # END bash completion -- do not remove this line
@@ -53,14 +56,14 @@ fi
 
 %postun
 if [ "$1" -eq 0 ]; then
+	umask 022
 	sed -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc \
 		> /etc/bashrc.tmp
 	mv -f /etc/bashrc.tmp /etc/bashrc
 fi
-chmod 644 /etc/bashrc
 
 %files
 %defattr(644,root,root,755)
 %doc README Changelog contrib
 %{_sysconfdir}/bash_completion
-%dir %{_sysconfdir}/bash_completion.d/
+%dir %{_sysconfdir}/bash_completion.d