[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d

[git]

[-- Attachment #1: Type: text/plain, Size: 3257 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d (commit)
       via  9118c7ca93fef4edea7e774d0af690e5e4dfd689 (commit)
      from  be90e5a50b457151d8c9757fca9bc09a61ae35a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Apr 14 22:42:17 2012 +0200

    findutils: Move to /usr.

commit 9118c7ca93fef4edea7e774d0af690e5e4dfd689
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Apr 14 22:41:34 2012 +0200

    bash: Move to /usr.

-----------------------------------------------------------------------

Summary of changes:
 bash/bash.nm           |   17 +++++++++++++----
 findutils/findutils.nm |   17 +++++++++--------
 2 files changed, 22 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/bash/bash.nm b/bash/bash.nm
index 4ea4fb9..c71e528 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
diff --git a/findutils/findutils.nm b/findutils/findutils.nm
index 652d138..c05b867 100644
--- a/findutils/findutils.nm
+++ b/findutils/findutils.nm
@@ -5,7 +5,7 @@
 
 name       = findutils
 version    = 4.5.10
-release    = 2
+release    = 3
 
 groups     = System/Tools
 url        = http://www.gnu.org/software/findutils/
@@ -35,18 +35,19 @@ build
 	test
 		make check
 	end
-
-	install_cmds
-		mkdir -pv %{BUILDROOT}/bin
-		mv -v %{BUILDROOT}/usr/bin/find %{BUILDROOT}/bin
-
-		sed -i -e 's/find:=${BINDIR}/find:=\/bin/' %{BUILDROOT}/usr/bin/updatedb
-	end
 end
 
 packages
 	package %{name}
 		groups += Base Build
+
+		provides
+			/bin/find
+		end
+
+		conflicts
+			filesystem < 002
+		end
 	end
 
 	package %{name}-debuginfo


hooks/post-receive
--
IPFire 3.x development tree