[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Wed May 23 15:47:12 UTC 2012 

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

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

Regenerate.

---

 autotools/Makefile.in              |    2 +-
 autotools/rtems-4.11-autoconf.spec |   30 ++++++++++++++++++++++--------
 autotools/rtems-4.11-automake.spec |   27 ++++++++++++++++++++++-----
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/autotools/Makefile.in b/autotools/Makefile.in
index 31754b7..af6ca6f 100644
--- a/autotools/Makefile.in
+++ b/autotools/Makefile.in
@@ -162,7 +162,7 @@ AUTOCONF_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/common/clean.add \
 	$(top_srcdir)/autotools/target-autoconf.add
 AUTOMAKE_VERS = 1.11.5
-AUTOMAKE_RPMREL = 1
+AUTOMAKE_RPMREL = 2
 AUTOMAKE_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/autotools/automake.add \
 	$(top_srcdir)/binutils/rpm-install.add \
diff --git a/autotools/rtems-4.11-autoconf.spec b/autotools/rtems-4.11-autoconf.spec
index d619286..1726a1c 100644
--- a/autotools/rtems-4.11-autoconf.spec
+++ b/autotools/rtems-4.11-autoconf.spec
@@ -50,9 +50,12 @@
 
 %define name			rtems-4.11-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,7 @@ 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
@@ -76,10 +77,17 @@ Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.%{?el5:gz}%{!?el
 
 
 
-# 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
@@ -97,14 +105,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
@@ -112,13 +120,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
@@ -128,9 +136,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}"
diff --git a/autotools/rtems-4.11-automake.spec b/autotools/rtems-4.11-automake.spec
index c7e11b7..2fa7e01 100644
--- a/autotools/rtems-4.11-automake.spec
+++ b/autotools/rtems-4.11-automake.spec
@@ -52,12 +52,15 @@
 %define name			rtems-4.11-automake
 %define requirements		rtems-4.11-autoconf >= 2.61
 
+# --with check          enable checks (default: off)
+%bcond_with             check
+
 Name:		%{name}
 URL:		http://sources.redhat.com/automake
 License:	GPL
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,10 +73,17 @@ Requires(preun):/sbin/install-info
 Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.%{?el5:gz}%{!?el5:xz}
 
 
-# remove bogus Automake perl dependencies and provides
+# 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
@@ -85,14 +95,14 @@ standards.
 %setup -q -n automake-%{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(Automake/d'
 EOF
-%global __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
+%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov
 chmod +x %{__perl_provides}
 
 cat << \EOF > %{name}-requ
@@ -100,7 +110,7 @@ cat << \EOF > %{name}-requ
 %{__perl_requires} $* |\
     sed -e '/^perl(Automake/d'
 EOF
-%global __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
+%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ
 chmod +x %{__perl_requires}
 %endif
 
@@ -121,6 +131,13 @@ esac
   --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

More information about the vc mailing list