[arch-commits] Commit in automake/trunk (2 files)

[Allan McRae]

    Date: Wednesday, August 15, 2012 @ 03:18:49
  Author: allan
Revision: 165304

upgpkg: automake 1.12.3-1

clean-up old patch

Modified:
  automake/trunk/PKGBUILD
Deleted:
  automake/trunk/automake-1.12.2-aclocal7-test-fix.diff

----------------------------------------+
 PKGBUILD                               |    7 ++-----
 automake-1.12.2-aclocal7-test-fix.diff |   18 ------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-15 07:12:15 UTC (rev 165303)
+++ PKGBUILD	2012-08-15 07:18:49 UTC (rev 165304)
@@ -13,15 +13,12 @@
 depends=('perl' 'bash')
 makedepends=('autoconf')
 install=automake.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
-        automake-1.12.2-aclocal7-test-fix.diff)
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
 md5sums=('0df082825f8f41087eb70c5088f4515e'
-         '1e272ddf91d347e1316afd970568ee81'
-         '12280109fc55cfb6197feecfbe7ab513')
+         '1e272ddf91d347e1316afd970568ee81')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  #patch -p2 -i $srcdir/automake-1.12.2-aclocal7-test-fix.diff
   ./configure --prefix=/usr
   make
 }

Deleted: automake-1.12.2-aclocal7-test-fix.diff
===================================================================
--- automake-1.12.2-aclocal7-test-fix.diff	2012-08-15 07:12:15 UTC (rev 165303)
+++ automake-1.12.2-aclocal7-test-fix.diff	2012-08-15 07:18:49 UTC (rev 165304)
@@ -1,18 +0,0 @@
-Fix a race condition that causes aclocal7 to fail on fast machines (see the
-comment below).
-
-diff -x config.log -x config.status -ru tmp/automake-1.12.2/t/aclocal7.sh work/automake-1.12.2/t/aclocal7.sh
---- tmp/automake-1.12.2/t/aclocal7.sh	2012-07-08 11:48:25.000000000 +0100
-+++ work/automake-1.12.2/t/aclocal7.sh	2012-07-10 11:58:50.325999591 +0100
-@@ -45,6 +45,11 @@
-   $AUTOMAKE --no-force
- }
- 
-+# aclocal will rewrite aclocal.m4 unless the input files are all older than the
-+# existing aclocal.m4 -- sleep to ensure somedefs.m4 has an older timestamp
-+# than the aclocal.m4 that the next aclocal call will generate.
-+$sleep
-+
- $ACLOCAL -I m4
- AUTOMAKE_after_aclocal
-