From 80e932432b1c3181be046be278521135c944d609 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 26 Jul 2009 05:56:46 +0000
Subject: Regenerate.

---
 contrib/crossrpms/autotools/rtems-4.9-autoconf.spec |  6 ++++--
 contrib/crossrpms/autotools/rtems-4.9-automake.spec | 13 +++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec b/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec
index 641b147444..80c0480dc8 100644
--- a/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec
+++ b/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -72,7 +72,8 @@ Requires:     	m4 gawk
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Source0: 	ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
+Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
+
 
 %description
 GNU's Autoconf is a tool for configuring source code and Makefiles.
@@ -89,6 +90,7 @@ their use.
 
 %prep
 %setup -q -n autoconf-%{srcvers}
+%{?PATCH0:%patch0 -p1}
 
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
diff --git a/contrib/crossrpms/autotools/rtems-4.9-automake.spec b/contrib/crossrpms/autotools/rtems-4.9-automake.spec
index 8e7ade04a9..87f41f24f9 100644
--- a/contrib/crossrpms/autotools/rtems-4.9-automake.spec
+++ b/contrib/crossrpms/autotools/rtems-4.9-automake.spec
@@ -40,7 +40,7 @@
 %endif
 
 %if "%{_build}" != "%{_host}"
-%define _host_rpmprefix rtems-4.9-%{_host}-
+%define _host_rpmprefix %{_host}-
 %else
 %define _host_rpmprefix %{nil}
 %endif
@@ -65,13 +65,18 @@ Provides:	rtems-4.9-automake-rtems = %{version}-%{release}
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
-BuildRequires:  %{requirements} perl help2man
+BuildRequires:  %{requirements} perl
+%if "%{version}" < "1.11"
+# automake >= 1.11 ships man-pages
+BuildRequires:  help2man
+%endif
 Requires:     	%{requirements}
 Requires(post):	/sbin/install-info
 Requires(preun):/sbin/install-info
 
 Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
 
+
 %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 +86,7 @@ standards.
 
 %prep
 %setup -q -n automake-%{srcvers}
+%{?PATCH0:%patch0 -p1}
 
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
@@ -113,6 +119,8 @@ make
 rm -rf "$RPM_BUILD_ROOT"
 make DESTDIR=${RPM_BUILD_ROOT} install
 
+%if "%{version}" < "1.11"
+# automake >= 1.11 ships man-pages
 install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
 for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
   $RPM_BUILD_ROOT%{_bindir}/automake ; 
@@ -121,6 +129,7 @@ do
   help2man $i > `basename $i`.1
   install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 done
+%endif
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
 echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist
-- 
cgit v1.2.3