From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 17 May 2004 20:18:16 +0000 (+0000)
Subject: - config(noreplace) for bashrc (suggested by mkochano); strict internal dep
X-Git-Tag: auto/ac/bash-2_05b-13
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbash.git;a=commitdiff_plain;h=80a4c26d466e00c47cdd6a146a3f9d8b0855d799

- config(noreplace) for bashrc (suggested by mkochano); strict internal dep

Changed files:
    bash.spec -> 1.136
---

diff --git a/bash.spec b/bash.spec
index a967193..da8f5c8 100644
--- a/bash.spec
+++ b/bash.spec
@@ -163,7 +163,7 @@ Summary(pl):	Statycznie skonsolidowany GNU Bourne Again Shell (bash)
 Group:		Applications/Shells
 Requires(post,preun):	grep
 Requires(preun):	fileutils
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description static
 Bash is a GNU project sh-compatible shell or command language
@@ -215,7 +215,7 @@ echo %{release} > _patchlevel
 
 %build
 %{__autoconf}
-cp -f /usr/share/automake/config.* support/
+cp -f /usr/share/automake/config.* support
 for mode in %{?with_static:static} shared; do
 %configure \
 	--enable-alias \
@@ -230,7 +230,8 @@ for mode in %{?with_static:static} shared; do
 	`[ "$mode" = "static" ] && echo "--enable-static-link"` \
 	--with-installed-readline
 
-%{__make} DEFS="-DHAVE_CONFIG_H -D_GNU_SOURCE"
+%{__make} \
+	DEFS="-DHAVE_CONFIG_H -D_GNU_SOURCE"
 
 [ "$mode" = "static" ] && mv -f bash bash.static || :
 done
@@ -311,7 +312,7 @@ fi
 %defattr(644,root,root,755)
 %doc NEWS README doc/{FAQ,INTRO}
 
-%config %verify(not md5 size mtime) %{_sysconfdir}/bashrc
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/bashrc
 %config(noreplace,missingok) %verify(not md5 size mtime) /etc/skel/.bash_logout
 %config(noreplace,missingok) %verify(not md5 size mtime) /etc/skel/.bash_profile
 %config(noreplace,missingok) %verify(not md5 size mtime) /etc/skel/.bashrc