Sync with rtems-4.10.

4 files changed, 22 insertions, 9 deletions

diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add
index b24f0bcdd7..2435548d9d 100644
--- a/contrib/crossrpms/autotools/autoconf.add
+++ b/contrib/crossrpms/autotools/autoconf.add
@@ -31,7 +31,7 @@ Requires:     	m4 gawk
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Source0: 	ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
+@SOURCES@
 
 %description
 GNU's Autoconf is a tool for configuring source code and Makefiles.
@@ -48,6 +48,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/autoconf.am b/contrib/crossrpms/autotools/autoconf.am
index a98c962e4b..8e0d714f54 100644
--- a/contrib/crossrpms/autotools/autoconf.am
+++ b/contrib/crossrpms/autotools/autoconf.am
@@ -4,10 +4,12 @@ AUTOCONF_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
 AUTOCONF_SUBPACKAGES += $(top_srcdir)/common/clean.add
 AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add
 
-autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in
+autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in $(srcdir)/autoconf-sources.add
 	cat $(AUTOCONF_SUBPACKAGES) | sed \
+	  -e "/[@]SOURCES[@]/r $(srcdir)/autoconf-sources.add" \
+	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
-	  -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
+	  -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)%{?dist}/" > $@
 CLEANFILES += autoconf.spec.in
 
 
diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add
index 55c3aa9252..272ba4536f 100644
--- a/contrib/crossrpms/autotools/automake.add
+++ b/contrib/crossrpms/autotools/automake.add
@@ -1,6 +1,6 @@
 %define rpmvers @AUTOMAKE_VERS@
 %define srcvers	@AUTOMAKE_VERS@
-%define amvers  1.10
+%define amvers  1.11
 
 %if "%{_prefix}" != "/usr"
 %define name			@rpmprefix@automake
@@ -25,12 +25,16 @@ Provides:	@rpmprefix@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
+@SOURCES@
 
 %description
 Automake is a tool for automatically generating "Makefile.in"s from
@@ -41,6 +45,7 @@ standards.
 
 %prep
 %setup -q -n automake-%{srcvers}
+%{?PATCH0:%patch0 -p1}
 
 # Work around rpm inserting bogus perl-module deps
 cat << \EOF > %{name}-prov
@@ -73,6 +78,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 ; 
@@ -81,6 +88,7 @@ do
   help2man $i > `basename $i`.1
   install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 done
+%endif
 
 %if "%{_prefix}" != "/usr"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am
index bd0b33c3e1..87c0567549 100644
--- a/contrib/crossrpms/autotools/automake.am
+++ b/contrib/crossrpms/autotools/automake.am
@@ -4,10 +4,12 @@ AUTOMAKE_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
 AUTOMAKE_SUBPACKAGES += $(top_srcdir)/common/clean.add
 AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add
 
-automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in
+automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.am $(srcdir)/automake-sources.add
 	cat $(AUTOMAKE_SUBPACKAGES) | sed \
-	  -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \
-	  -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@
+	  -e "/[@]SOURCES[@]/r $(srcdir)/automake-sources.add" \
+	  -e "/[@]SOURCES[@]/d" \
+	  -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/g" \
+	  -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)%{?dist}/g" > $@
 CLEANFILES += automake.spec.in