From 46d225df703fc570bc728e0ebb0f06b614576be6 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Sat, 12 Jan 2013 10:07:41 +0100
Subject: [PATCH] Disable vala tests again (still not fixed in 1.13.1)

Sorry for noise.
---
 automake-1.13.1-disable-vala-tests.patch | 21 +++++++++++++++++++++
 automake.spec                            | 12 ++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 automake-1.13.1-disable-vala-tests.patch

diff --git a/automake-1.13.1-disable-vala-tests.patch b/automake-1.13.1-disable-vala-tests.patch
new file mode 100644
index 0000000..d79669a
--- /dev/null
+++ b/automake-1.13.1-disable-vala-tests.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile.in b/Makefile.in
+index 47badba..7c57915 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1987,16 +1987,6 @@ t/upc2.sh \
+ t/upc3.sh \
+ t/vala-configure.sh \
+ t/vala-grepping.sh \
+-t/vala-headers.sh \
+-t/vala-libs.sh \
+-t/vala-mix.sh \
+-t/vala-mix2.sh \
+-t/vala-non-recursive-setup.sh \
+-t/vala-parallel.sh \
+-t/vala-per-target-flags.sh \
+-t/vala-recursive-setup.sh \
+-t/vala-vapi.sh \
+-t/vala-vpath.sh \
+ t/vars.sh \
+ t/vars3.sh \
+ t/var-recurs.sh \
diff --git a/automake.spec b/automake.spec
index 651c82b..82a147d 100644
--- a/automake.spec
+++ b/automake.spec
@@ -7,6 +7,9 @@ Release:    1%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
+# Disable test with vala (in Makefile.in — not Makefile.am — until the
+# autoreconf run is not safe)
+Patch0:     automake-1.13.1-disable-vala-tests.patch
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
 BuildRequires:  autoconf >= 2.65
@@ -40,6 +43,11 @@ Makefiles.
 
 %prep
 %setup -q -n automake-%{version}
+%patch0 -p1 -b .vala_tests_disable
+# TODO: Do not run autoreconf until we are sure that on build machine is
+# installed automake 1.13.  Otherwise it will cause that Makefile is not using
+# AM_TEST_ENVIRONMENT properly and testsuite will not work.
+#autoreconf -i -f
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
@@ -76,12 +84,12 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Thu Jan 10 2013 Pavel Raiskup <praiskup@redhat.com> - 1.13.1-1
+* Sat Jan 12 2013 Pavel Raiskup <praiskup@redhat.com> - 1.13.1-1
 - update to recent automake-1.13.1
 - minimum required autoconf is 2.65 (based on upstream suggestion)
 - make check is run now parallel (based on 't/README' it helps also on
   single-thread machines)
-- drop unnecessary patches
+- drop old sleep-patch and better disable vala tests (requires autoreconf)
 
 * Wed Oct 25 2012 Pavel Raiskup <praiskup@redhat.com> - 1.12.2-6
 - fedora-review -> s/define/global/, s/RPM_BUILD_ROOT/buildroot/,