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

gawk: Move tool to /usr.
---

diff --git a/gawk/gawk.nm b/gawk/gawk.nm
index 3cd81fa2e..2b7d077ce 100644
--- a/gawk/gawk.nm
+++ b/gawk/gawk.nm
@@ -5,7 +5,7 @@
 
 name       = gawk
 version    = 4.0.1
-release    = 1
+release    = 2
 
 groups     = System/Tools
 url        = http://www.gnu.org/software/gawk/gawk.html
@@ -28,8 +28,6 @@ build
 	end
 
 	configure_options += \
-		--bindir=/bin \
-		--libexecdir=%{libdir} \
 		--with-libsigsegv-prefix=no
 
 	test
@@ -37,20 +35,25 @@ build
 	end
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/usr/bin
-		ln -svf ../../bin/awk %{BUILDROOT}/usr/bin/awk
-		ln -svf ../../bin/gawk %{BUILDROOT}/usr/bin/gawk
-
-		mv -v %{BUILDROOT}/bin/{p,i}gawk %{BUILDROOT}/usr/bin/
+		ln -svf gawk %{BUILDROOT}/usr/bin/awk
 
 		# Remove versioned binary.
-		rm -rfv %{BUILDROOT}/bin/{,p}gawk-*
+		rm -rfv %{BUILDROOT}%{bindir}/{,p}gawk-*
 	end
 end
 
 packages
 	package %{name}
 		groups += Base Build
+
+		provides
+			/bin/awk
+			/bin/gawk
+		end
+
+		conflicts
+			filesystem < 002
+		end
 	end
 
 	package %{name}-debuginfo