autoconf-2.67.

3 files changed, 12 insertions, 3 deletions

diff --git a/contrib/crossrpms/autotools/Makefile.am b/contrib/crossrpms/autotools/Makefile.am
index 70e2732550..087eb1fd72 100644
--- a/contrib/crossrpms/autotools/Makefile.am
+++ b/contrib/crossrpms/autotools/Makefile.am
@@ -4,7 +4,7 @@
 
 include $(top_srcdir)/mkspec.am
 
-AUTOCONF_VERS = 2.66
+AUTOCONF_VERS = 2.67
 AUTOCONF_RPMREL = 1
 include ./autoconf.am
 
diff --git a/contrib/crossrpms/autotools/autoconf-sources.add b/contrib/crossrpms/autotools/autoconf-sources.add
index a0797e6d6d..cf9c28ff4e 100644
--- a/contrib/crossrpms/autotools/autoconf-sources.add
+++ b/contrib/crossrpms/autotools/autoconf-sources.add
@@ -1,8 +1,9 @@
 Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
+%if "%{srcvers}" == "2.66"
 # Fedora's patch to fix
 # http://lists.gnu.org/archive/html/autoconf/2010-07/msg00004.html
 # http://lists.gnu.org/archive/html/bug-autoconf/2010-07/msg00012.html
 Patch0: autoconf-2.66-611661.diff
-
+%endif
 
 
diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add
index 631a230353..2db2bf2f82 100644
--- a/contrib/crossrpms/autotools/autoconf.add
+++ b/contrib/crossrpms/autotools/autoconf.add
@@ -69,11 +69,19 @@ make
 
 %check
 %if "%{_build}" == "%{_host}"
+%if "%{srcvers}" <= "2.66"
 # test 193 fails sporadically
 # test 199 fails deterministically
 make check TESTSUITEFLAGS='-192 194-198 200-'
+%else
+%if "%{srcvers}" <= "2.67"
+# test 199 fails deterministically
+make check TESTSUITEFLAGS='-198 200-'
+%else
+make check
+%endif
+%endif
 %endif
-
 %install
 rm -rf "${RPM_BUILD_ROOT}"
 make DESTDIR=${RPM_BUILD_ROOT} install