[autoconf213] testsuite: disable more tests for RHEL7 builds
Pavel Raiskup
praiskup at fedoraproject.org
Fri Oct 18 12:16:50 UTC 2013
commit b7080f7ef36c0c22ca6b095b1fa5ea3dd3880724
Author: Pavel Raiskup <praiskup at redhat.com>
Date: Fri Oct 18 14:15:17 2013 +0200
testsuite: disable more tests for RHEL7 builds
Resolves: #1017965
Version: 2.13-30
autoconf213-testsuite-rhel.patch | 13 +++++++++++++
autoconf213.spec | 15 +++++++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/autoconf213-testsuite-rhel.patch b/autoconf213-testsuite-rhel.patch
new file mode 100644
index 0000000..4190332
--- /dev/null
+++ b/autoconf213-testsuite-rhel.patch
@@ -0,0 +1,13 @@
+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.spec b/autoconf213.spec
index f97d860..6b2fd88 100644
--- a/autoconf213.spec
+++ b/autoconf213.spec
@@ -1,7 +1,7 @@
Summary: A GNU tool for automatically configuring source code
Name: autoconf213
Version: 2.13
-Release: 29%{?dist}
+Release: 30%{?dist}
License: GPLv2+
Group: Development/Tools
URL: http://www.gnu.org/software/autoconf/
@@ -19,10 +19,14 @@ 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
-Buildrequires: texinfo, m4 >= 1.1, perl, gawk, dejagnu, compat-gcc-34-g77, flex
+Buildrequires: texinfo, m4 >= 1.1, perl, gawk, dejagnu, flex
+%if !0%{?rhel:1}
+BuildRequires: compat-gcc-34-g77
+%endif
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +61,10 @@ 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
@@ -95,6 +103,9 @@ rm -rf ${RPM_BUILD_ROOT}
%doc AUTHORS COPYING NEWS README TODO
%changelog
+* Fri Oct 18 2013 Pavel Raiskup <praiskup at redhat.com> - 2.13-30
+- disable g77 tests for RHEL7 builds
+
* Wed Oct 09 2013 Pavel Raiskup <praiskup at redhat.com> - 2.13-29
- enable testsuite for obsolescent autoconf213
More information about the scm-commits
mailing list