From 4f07356d47b9bdb5e77ac1010c8ce39cf79721e6 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Jul 28 2014 10:04:22 +0000 Subject: tests: don't expect f77 is anywhere Resolves: #123282 Version: 2.13-32 --- diff --git a/autoconf213-testsuite-rhel.patch b/autoconf213-testsuite-rhel.patch deleted file mode 100644 index 4190332..0000000 --- a/autoconf213-testsuite-rhel.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/testsuite/autoconf.s/syntax.exp b/testsuite/autoconf.s/syntax.exp -index 3c5738a..6f8c4f0 100644 ---- a/testsuite/autoconf.s/syntax.exp -+++ b/testsuite/autoconf.s/syntax.exp -@@ -2,7 +2,7 @@ - - send_user "Checking for syntax errors in the specific tests...\n" - set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} --set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v AC_FUNC_GETLOADAVG] -+set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77] - - foreach mac $macros { - send_user "$mac\n" diff --git a/autoconf213-testsuite.patch b/autoconf213-testsuite.patch index 2eae233..4da53ce 100644 --- a/autoconf213-testsuite.patch +++ b/autoconf213-testsuite.patch @@ -7,7 +7,7 @@ index 95a4611..3c5738a 100644 send_user "Checking for syntax errors in the specific tests...\n" set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} -set macros [exec sed -n $script $srcdir/../acspecific.m4] -+set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v AC_FUNC_GETLOADAVG] ++set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77] foreach mac $macros { send_user "$mac\n" diff --git a/autoconf213.spec b/autoconf213.spec index 07f44f1..9f97ae9 100644 --- a/autoconf213.spec +++ b/autoconf213.spec @@ -19,7 +19,6 @@ Patch9: autoconf-2.13-versioning.patch Patch10: autoconf213-destdir.patch Patch11: autoconf213-info.patch Patch12: autoconf213-testsuite.patch -Patch13: autoconf213-testsuite-rhel.patch Requires: gawk, m4 >= 1.1, coreutils, perl Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -58,10 +57,6 @@ use. %patch10 -p1 %patch11 -p1 %patch12 -p1 -%if 0%{?rhel:1} -# don't expect /usr/bin/f77 is installed on RHEL7 -%patch13 -p1 -%endif mv autoconf.texi autoconf213.texi rm -f autoconf.info