[automake] Disable also checking for non-existence of this macros

[Pavel Raiskup]

commit 4c6d5a0d5047f2b4734a7a25d800f1f8dd36e9da
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Thu Jan 17 16:52:42 2013 +0100

    Disable also checking for non-existence of this macros
    
    Related: #896442

 automake-1.13.1-disable-tests.patch      |   30 ++++++++++++++++++++++++++++++
 automake-1.13.1-disable-vala-tests.patch |   21 ---------------------
 automake.spec                            |    9 +++++----
 3 files changed, 35 insertions(+), 25 deletions(-)
---
diff --git a/automake-1.13.1-disable-tests.patch b/automake-1.13.1-disable-tests.patch
new file mode 100644
index 0000000..069541f
--- /dev/null
+++ b/automake-1.13.1-disable-tests.patch
@@ -0,0 +1,30 @@
+diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
+index 591b4f0..20a9398 100644
+--- a/t/list-of-tests.mk
++++ b/t/list-of-tests.mk
+@@ -130,8 +130,6 @@ t/amhello-cross-compile.sh \
+ t/amhello-binpkg.sh \
+ t/aminit-moreargs-deprecation.sh \
+ t/amassign.sh \
+-t/am-config-header-no-more.sh \
+-t/am-prog-cc-stdc-no-more.sh \
+ t/am-macro-not-found.sh \
+ t/amopt.sh \
+ t/amopts-location.sh \
+@@ -1202,16 +1200,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 3a59939..fbf8dac 100644
--- a/automake.spec
+++ b/automake.spec
@@ -9,8 +9,8 @@ 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
-Patch1:     automake-1.13.1-reenable-disabled-macros.patch
+Patch0:     automake-1.13.1-reenable-disabled-macros.patch
+Patch1:     automake-1.13.1-disable-tests.patch
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
 BuildRequires:  autoconf >= 2.65
@@ -51,8 +51,8 @@ Makefiles.
 
 %prep
 %setup -q -n automake-%{version}
-%patch0 -p1 -b .vala_tests_disable
-%patch1 -p1 -b .reenable_macros
+%patch0 -p1 -b .reenable_macros
+%patch1 -p1 -b .disable_tests
 autoreconf -i -f
 
 %build
@@ -92,6 +92,7 @@ fi
 %changelog
 * Thu Jan 17 2013 Pavel Raiskup <praiskup at redhat.com> - 1.13.1-3
 - re-enable AM_CONFIG_HEADER macro in Fedora distribution (#896442)
+- disable testing for non-existence of this macros (join with vala)
 
 * Mon Jan 14 2013 Pavel Raiskup <praiskup at redhat.com> - 1.13.1-2
 - allow to run bigger subset of tests in testsuite