GNU Automake 1.11.2.

svn path=/nixpkgs/trunk/; revision=31667

2 files changed, 2 insertions, 49 deletions

diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index 148d0a600eb..65ef3a9a146 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}:
 
 stdenv.mkDerivation rec {
-  name = "automake-1.11.1";
+  name = "automake-1.11.2";
 
   # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
   # available upstream; see
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/automake/${name}.tar.bz2";
-    sha256 = "1bn7jl11wbkyy4ivgja92zkyjj8w3agwp2xnf7g8f7qa1qy9s5av";
+    sha256 = "06476qbd16dlasz29drmljqmr4gwx4qgcl075033b2hc73wx2ijg";
   };
 
   buildInputs = [perl autoconf makeWrapper];
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
   # "fixed" path in generated files!
   dontPatchShebangs = true;
 
-  patches = [ ./more-robust-silent-tests.patch ];
-
   meta = {
     homepage = http://www.gnu.org/software/automake/;
     description = "GNU Automake, a GNU standard-compliant makefile generator";
diff --git a/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch b/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
deleted file mode 100644
index ca37c412ca2..00000000000
--- a/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Make these tests more robust.  Previously, they would fail if the name
-of the build directory contains `mv', which can very well happen with Nix.
-
---- automake-1.11.1/tests/silent.test	2009-12-08 19:02:32.000000000 +0100
-+++ automake-1.11.1/tests/silent.test	2010-07-05 13:15:20.000000000 +0200
-@@ -1,9 +1,9 @@
- #!/bin/sh
--# Copyright (C) 2009  Free Software Foundation, Inc.
-+# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2, or (at your option)
- # any later version.
- #
- # This program is distributed in the hope that it will be useful,
-@@ -65,7 +65,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
- grep ' -c' stdout && Exit 1
- grep ' -o foo' stdout && Exit 1
--grep mv stdout && Exit 1
-+grep '\<mv\>' stdout && Exit 1
- grep 'CC    .*foo\.' stdout
- grep 'CC .*bar\.' stdout
- grep 'CC .*baz\.' stdout
-
---- automake-1.11.1/tests/silent2.test	2009-12-08 19:02:32.000000000 +0100
-+++ automake-1.11.1/tests/silent2.test	2010-07-05 15:42:08.000000000 +0200
-@@ -1,5 +1,5 @@
- #!/bin/sh
--# Copyright (C) 2009  Free Software Foundation, Inc.
-+# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -67,7 +67,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
- cat stdout
- grep ' -c' stdout && Exit 1
- grep ' -o foo' stdout && Exit 1
--grep mv stdout && Exit 1
-+grep '\<mv\>' stdout && Exit 1
- grep 'CC .*foo\.' stdout
- grep 'CC .*bar\.' stdout
- grep 'CC .*baz\.' stdout
-