Merger from CVS-HEAD.

8 files changed, 18 insertions, 7 deletions

diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add
index b273011c7b..b24f0bcdd7 100644
--- a/contrib/crossrpms/autotools/autoconf.add
+++ b/contrib/crossrpms/autotools/autoconf.add
@@ -1,5 +1,5 @@
-%define rpmvers 2.61
-%define srcvers	2.61
+%define srcvers	@AUTOCONF_VERS@
+%define rpmvers %{expand:%(echo "@AUTOCONF_VERS@" | tr - _ )}
 
 %if "%{_prefix}" != "/usr"
 %define name			@rpmprefix@autoconf
@@ -13,7 +13,7 @@ License:	GPL
 URL:		http://www.gnu.org/software/autoconf
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	@AUTOCONF_RPMREL@%{?dist}
+Release:	@AUTOCONF_RPMREL@
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 %if "%{_prefix}" != "/usr"
@@ -24,6 +24,9 @@ Provides:	@rpmprefix@autoconf-rtems = %{version}-%{release}
 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
diff --git a/contrib/crossrpms/autotools/autoconf.am b/contrib/crossrpms/autotools/autoconf.am
index cdd77f7f88..a98c962e4b 100644
--- a/contrib/crossrpms/autotools/autoconf.am
+++ b/contrib/crossrpms/autotools/autoconf.am
@@ -6,6 +6,7 @@ AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add
 
 autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in
 	cat $(AUTOCONF_SUBPACKAGES) | sed \
+	  -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
 	  -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
 CLEANFILES += autoconf.spec.in
 
diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add
index ba8c72cb77..55c3aa9252 100644
--- a/contrib/crossrpms/autotools/automake.add
+++ b/contrib/crossrpms/autotools/automake.add
@@ -1,5 +1,5 @@
-%define rpmvers 1.10
-%define srcvers	1.10
+%define rpmvers @AUTOMAKE_VERS@
+%define srcvers	@AUTOMAKE_VERS@
 %define amvers  1.10
 
 %if "%{_prefix}" != "/usr"
@@ -15,7 +15,7 @@ URL:		http://sources.redhat.com/automake
 License:	GPL
 Group:		Development/Tools
 Version:	%{rpmvers}
-Release:	@AUTOMAKE_RPMREL@%{?dist}
+Release:	@AUTOMAKE_RPMREL@
 Summary:	Tool for automatically generating GNU style Makefile.in's
 
 %if "%{_prefix}" != "/usr"
diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am
index bcf7dc4648..bd0b33c3e1 100644
--- a/contrib/crossrpms/autotools/automake.am
+++ b/contrib/crossrpms/autotools/automake.am
@@ -6,6 +6,7 @@ AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add
 
 automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in
 	cat $(AUTOMAKE_SUBPACKAGES) | sed \
+	  -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \
 	  -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@
 CLEANFILES += automake.spec.in
 
diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add
index 76824acacf..e981d12200 100644
--- a/contrib/crossrpms/binutils/base-binutils.add
+++ b/contrib/crossrpms/binutils/base-binutils.add
@@ -38,6 +38,7 @@ fi
 
 %files -n @rpmprefix@binutils-common
 %defattr(-,root,root)
+%sysdir %{_prefix}
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/as.info*
diff --git a/contrib/crossrpms/binutils/install.add b/contrib/crossrpms/binutils/install.add
index 77f895eb97..d31d83950b 100644
--- a/contrib/crossrpms/binutils/install.add
+++ b/contrib/crossrpms/binutils/install.add
@@ -45,6 +45,9 @@
   if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-windres%{_exeext}; then 
     rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windres*
   fi
+  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-windmc%{_exeext}; then 
+    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windmc*
+  fi
 
   cd ..
 
diff --git a/contrib/crossrpms/binutils/target-binutils.add b/contrib/crossrpms/binutils/target-binutils.add
index b93c539e06..9b5b3ff1b3 100644
--- a/contrib/crossrpms/binutils/target-binutils.add
+++ b/contrib/crossrpms/binutils/target-binutils.add
@@ -13,6 +13,7 @@ GNU binutils targetting @tool_target@.
 
 %files -n @rpmprefix@@tool_target@-binutils
 %defattr(-,root,root)
+%sysdir %{_prefix}
 %sysdir %{_mandir}
 %sysdir %{_mandir}/man1
 %{_mandir}/man1/@tool_target@-*.1*
diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add
index b6014fd66a..3f00749d5b 100644
--- a/contrib/crossrpms/gcc/rpm-install.add
+++ b/contrib/crossrpms/gcc/rpm-install.add
@@ -47,7 +47,7 @@ EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 
-
+%ifnarch noarch
 # Extract %%__debug_install_post into debug_install_post~
 cat << \EOF > debug_install_post~
 %__debug_install_post
@@ -69,4 +69,5 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 < debug_install_post~ > debug_install_post 
 %define __debug_install_post . ./debug_install_post
 
+%endif