[rtems-crossrpms commit] Preps for autoconf-2.69.

[Ralf Corsepius]

Module:    rtems-crossrpms
Branch:    master
Commit:    5a6db24f2cb9418049e6ffaaf6d93e0a4cb19288
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=5a6db24f2cb9418049e6ffaaf6d93e0a4cb19288

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Wed May 23 09:05:17 2012 +0200

Preps for autoconf-2.69.
Overhaul perl-filters.

---

 autotools/autoconf.add |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/autotools/autoconf.add b/autotools/autoconf.add
index eaca5b0..f22ad49 100644
--- a/autotools/autoconf.add
+++ b/autotools/autoconf.add
@@ -7,9 +7,12 @@
 %define name			autoconf
 %endif
 
-# --with alltests	enable all tests
+# --with alltests	enable all tests (default: off)
 %bcond_with		alltests
 
+# --with check          enable checks (default: off)
+%bcond_with             check
+
 Name:		%{name}
 License:	GPL
 URL:		http://www.gnu.org/software/autoconf
@@ -21,19 +24,24 @@ Summary:	Tool for automatically generating GNU style Makefile.in's
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires: 	perl m4 gawk emacs
-%if "%{version}" >= "2.62"
 BuildRequires:  m4 >= 1.4.5
-%endif
 Requires:     	m4 gawk
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
 @SOURCES@
 
-# remove bogus Autoconf perl dependencies and provides
+# rpm-4.9 filter
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Autom4te::
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Autom4te::
 
+# rpm-4.8 filter
+%{?filter_setup:
+%filter_from_provides /^perl(Autom4te::/d
+%filter_from_requires /^perl(Autom4te::/d
+%filter_setup
+}
+
 %description
 GNU's Autoconf is a tool for configuring source code and Makefiles.
 Using Autoconf, programmers can create portable and configurable
@@ -51,14 +59,14 @@ their use.
 %setup -q -n autoconf-%{srcvers}
 %{?PATCH0:%patch0 -p1}
 
-%if !%{defined fedora}
+%if 0%{?el5} || 0%{?suse11_4}
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
 #!/bin/sh
 %{__perl_provides} $* |\
     sed -e '/^perl(Autom4te/d'
 EOF
-%global __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
+%define __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-requ
@@ -66,13 +74,13 @@ cat << \EOF > %{name}-requ
 %{__perl_requires} $* |\
     sed -e '/^perl(Autom4te/d'
 EOF
-%global __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
+%define __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ
 chmod +x %{__perl_requires}
 %endif
 
 %build
 ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
-  --bindir=%{_bindir} --datadir=%{_datadir}
+  --bindir=%{_bindir} --datadir=%{_datadir} --disable-silent-rules
 make
 
 %check
@@ -82,9 +90,15 @@ make
 # test 205 fails deterministically
 TESTSUITEFLAGS='-198 200-204 206-'
 %endif
+%if "%{srcvers}" == "2.69"
+# test 209 fails sporadically
+TESTSUITEFLAGS='-208 210-'
+%endif
 
+%if %{with check}
 make check %{!?with_alltests:TESTSUITEFLAGS="${TESTSUITEFLAGS}"}
 %endif
+%endif
 
 %install
 rm -rf "${RPM_BUILD_ROOT}"