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

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2031 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  be90e5a50b457151d8c9757fca9bc09a61ae35a8 (commit)
      from  f43b253bcea71435c8d9131aed19578132055ef8 (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 be90e5a50b457151d8c9757fca9bc09a61ae35a8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Apr 14 22:14:16 2012 +0200

    gawk: Move tool to /usr.

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

Summary of changes:
 gawk/gawk.nm |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/gawk/gawk.nm b/gawk/gawk.nm
index 3cd81fa..2b7d077 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


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