[rtems-crossrpms commit] Sync with rtems-4.11.

[Ralf Corsepius]

Module:    rtems-crossrpms
Branch:    rtems-4-10-branch
Commit:    86e52fe6da9c015841b57ebe45fadab6f07eb79b
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=86e52fe6da9c015841b57ebe45fadab6f07eb79b

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Tue Sep 18 05:38:18 2012 +0200

Sync with rtems-4.11.

---

 autotools/autoconf.add |   43 +++++++++++++++++++++++++++----------------
 autotools/automake.add |   33 ++++++++++++++++++++++++++++-----
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/autotools/autoconf.add b/autotools/autoconf.add
index 80a97b4..e7382d2 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,15 +24,25 @@ 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:  perl(Data::Dumper)
 BuildRequires:  m4 >= 1.4.5
-%endif
 Requires:     	m4 gawk
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
 @SOURCES@
 
+# 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
@@ -47,6 +60,7 @@ their use.
 %setup -q -n autoconf-%{srcvers}
 %{?PATCH0:%patch0 -p1}
 
+%if 0%{?el5} || 0%{?suse11_4}
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
 #!/bin/sh
@@ -63,32 +77,29 @@ cat << \EOF > %{name}-requ
 EOF
 %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
 %if "%{_build}" == "%{_host}"
-%if "%{srcvers}" <= "2.66"
-# test 193 fails sporadically
-# test 199 fails deterministically
-TESTSUITEFLAGS='-192 194-198 200-'
-%endif
-
-%if "%{srcvers}" == "2.67"
-# test 199 fails deterministically
-TESTSUITEFLAGS='-198 200-'
-%endif
-
 %if "%{srcvers}" == "2.68"
+# test 199 fails sporadically
 # test 205 fails deterministically
-TESTSUITEFLAGS='-204 206-'
+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}"
diff --git a/autotools/automake.add b/autotools/automake.add
index 44c4a2a..7c496aa 100644
--- a/autotools/automake.add
+++ b/autotools/automake.add
@@ -1,6 +1,6 @@
-%define rpmvers @AUTOMAKE_VERS@
-%define srcvers	@AUTOMAKE_VERS@
-%define amvers  1.11
+%global rpmvers @AUTOMAKE_VERS@
+%global srcvers	@AUTOMAKE_VERS@
+%global amvers  1.11
 
 %if "%{_prefix}" != "/usr"
 %define name			@rpmprefix at automake
@@ -10,6 +10,9 @@
 %define requirements		autoconf >= 2.61
 %endif
 
+# --with check          enable checks (default: off)
+%bcond_with             check
+
 Name:		%{name}
 URL:		http://sources.redhat.com/automake
 License:	GPL
@@ -27,6 +30,17 @@ Requires(preun):/sbin/install-info
 
 @SOURCES@
 
+# rpm-4.9 filter
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake::
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake::
+
+# rpm-4.8 filter
+%{?filter_setup:
+%filter_from_provides /^perl(Automake::/d
+%filter_from_requires /^perl(Automake::/d
+%filter_setup
+}
+
 %description
 Automake is a tool for automatically generating "Makefile.in"s from
 files called "Makefile.am". "Makefile.am" is basically a series of
@@ -38,6 +52,7 @@ standards.
 %setup -q -n automake-%{srcvers}
 %{?PATCH0:%patch0 -p1}
 
+%if 0%{?el5} || 0%{?suse11_4}
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
 #!/bin/sh
@@ -54,7 +69,7 @@ cat << \EOF > %{name}-requ
 EOF
 %define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
 chmod +x %{__perl_requires}
-
+%endif
 
 %build
 PATH=%{_bindir}:$PATH
@@ -69,9 +84,17 @@ esac
 # outdated versions bundled with rpm.
 ./configure -C --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \
   --bindir=%{_bindir} --datadir=%{_datadir} \
-  --docdir=%{_datadir}/automake-%{amvers}/doc
+  --docdir=%{_datadir}/automake-%{amvers}/doc \
+  --disable-silent-rules
 make
 
+%check
+%if "%{_build}" == "%{_host}"
+%if %{with check}
+make check
+%endif
+%endif
+
 %install
 rm -rf "$RPM_BUILD_ROOT"
 make DESTDIR=${RPM_BUILD_ROOT} install