[rtems-crossrpms commit] Regenerate.

[Ralf Corsepius]

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

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

Regenerate.

---

 autotools/rtems-4.10-autoconf.spec |   44 ++++++++++++++++++++++-------------
 autotools/rtems-4.10-automake.spec |   33 ++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/autotools/rtems-4.10-autoconf.spec b/autotools/rtems-4.10-autoconf.spec
index 2909628..1a35a9d 100644
--- a/autotools/rtems-4.10-autoconf.spec
+++ b/autotools/rtems-4.10-autoconf.spec
@@ -50,9 +50,12 @@
 
 %define name			rtems-4.10-autoconf
 
-# --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
@@ -64,9 +67,9 @@ 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:  /bin/hostname
+BuildRequires:  perl(Data::Dumper)
 BuildRequires:  m4 >= 1.4.5
-%endif
 Requires:     	m4 gawk
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
@@ -81,6 +84,17 @@ Patch0: autoconf-2.66-611661.diff
 
 
 
+# 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
@@ -98,6 +112,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
@@ -114,32 +129,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/rtems-4.10-automake.spec b/autotools/rtems-4.10-automake.spec
index 9176b2b..829af77 100644
--- a/autotools/rtems-4.10-automake.spec
+++ b/autotools/rtems-4.10-automake.spec
@@ -45,13 +45,16 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define rpmvers 1.11.1
-%define srcvers	1.11.1
-%define amvers  1.11
+%global rpmvers 1.11.1
+%global srcvers	1.11.1
+%global amvers  1.11
 
 %define name			rtems-4.10-automake
 %define requirements		rtems-4.10-autoconf >= 2.61
 
+# --with check          enable checks (default: off)
+%bcond_with             check
+
 Name:		%{name}
 URL:		http://sources.redhat.com/automake
 License:	GPL
@@ -70,6 +73,17 @@ Requires(preun):/sbin/install-info
 Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
 
 
+# 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
@@ -81,6 +95,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
@@ -97,7 +112,7 @@ cat << \EOF > %{name}-requ
 EOF
 %define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
 chmod +x %{__perl_requires}
-
+%endif
 
 %build
 PATH=%{_bindir}:$PATH
@@ -112,9 +127,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