From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 14 Apr 2012 20:41:34 +0000 (+0200)
Subject: bash: Move to /usr.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9118c7ca93fef4edea7e774d0af690e5e4dfd689;p=ipfire-3.x.git

bash: Move to /usr.
---

diff --git a/bash/bash.nm b/bash/bash.nm
index 4ea4fb9db..c71e52877 100644
--- a/bash/bash.nm
+++ b/bash/bash.nm
@@ -5,7 +5,7 @@
 
 name       = bash
 version    = 4.2
-release    = 8
+release    = 9
 
 groups     = System/Tools
 url        = http://www.gnu.org/software/bash/
@@ -26,6 +26,7 @@ build
 		autoconf
 		automake
 		bison
+		filesystem >= 002
 		ncurses-devel
 		readline-devel
 	end
@@ -41,7 +42,6 @@ build
 	end
 
 	configure_options += \
-		--bindir=/bin \
 		--without-bash-malloc \
 		--with-installed-readline
 
@@ -51,7 +51,7 @@ build
 	#end
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/{bin,etc/profile.d,root}
+		mkdir -pv %{BUILDROOT}/{etc/profile.d,root}
 
 		# Bash startup files
 		cp -vf %{DIR_SOURCE}/dot_bash_logout %{BUILDROOT}/root/.bash_logout
@@ -61,7 +61,7 @@ build
 		# /etc/profile.d
 		cp -vf %{DIR_SOURCE}/profile.d/* %{BUILDROOT}/etc/profile.d
 
-		ln -svf bash %{BUILDROOT}/bin/sh
+		ln -svf bash %{BUILDROOT}%{bindir}/sh
 	end
 end
 
@@ -75,6 +75,15 @@ packages
 			/etc/profile
 		end
 
+		provides
+			/bin/bash
+			/bin/sh
+		end
+
+		conflicts
+			filesystem < 002
+		end
+
 		script posttransin
 			# Create /etc/shells, if it does not exist.
 			[ -f "/etc/shells" ] || touch /etc/shells