Regenerate.

18 files changed, 72 insertions, 27 deletions

diff --git a/contrib/crossrpms/rtems4.8/arm/Makefile.am b/contrib/crossrpms/rtems4.8/arm/Makefile.am
index 5ccf78d192..724a18d544 100644
--- a/contrib/crossrpms/rtems4.8/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/arm/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-binutils.spec
index f3fac1e77c..3f88ef1c4c 100644
--- a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-arm-rtems4.8-binutils
 Summary:	Binutils for target arm-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/bfin/Makefile.am b/contrib/crossrpms/rtems4.8/bfin/Makefile.am
index 0561d3a82d..cef779a595 100644
--- a/contrib/crossrpms/rtems4.8/bfin/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/bfin/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-binutils.spec
index f2a14607b1..712fd90099 100644
--- a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-bfin-rtems4.8-binutils
 Summary:	Binutils for target bfin-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/h8300/Makefile.am b/contrib/crossrpms/rtems4.8/h8300/Makefile.am
index 8c0b5748b6..0e2d7173c6 100644
--- a/contrib/crossrpms/rtems4.8/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/h8300/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-binutils.spec
index 763b1947d9..5568532fba 100644
--- a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-h8300-rtems4.8-binutils
 Summary:	Binutils for target h8300-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/i386/Makefile.am b/contrib/crossrpms/rtems4.8/i386/Makefile.am
index 4bfe3197e1..a137a4c3ea 100644
--- a/contrib/crossrpms/rtems4.8/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/i386/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-binutils.spec
index af9f3577af..d5d66df8c1 100644
--- a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-i386-rtems4.8-binutils
 Summary:	Binutils for target i386-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/m68k/Makefile.am b/contrib/crossrpms/rtems4.8/m68k/Makefile.am
index c85b36a5da..6c5858545e 100644
--- a/contrib/crossrpms/rtems4.8/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/m68k/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-binutils.spec
index 066fbc21ee..ef968f08da 100644
--- a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-m68k-rtems4.8-binutils
 Summary:	Binutils for target m68k-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/mips/Makefile.am b/contrib/crossrpms/rtems4.8/mips/Makefile.am
index 0624ab8c62..df5c0c6532 100644
--- a/contrib/crossrpms/rtems4.8/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/mips/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-binutils.spec
index 6f3da59a7e..1b0f804f6d 100644
--- a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-mips-rtems4.8-binutils
 Summary:	Binutils for target mips-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
index a1c1153a7c..e590e15465 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-binutils.spec
index 7b47d568e3..04752488a9 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-powerpc-rtems4.8-binutils
 Summary:	Binutils for target powerpc-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/sh/Makefile.am b/contrib/crossrpms/rtems4.8/sh/Makefile.am
index 334d21922c..8c8f46f39b 100644
--- a/contrib/crossrpms/rtems4.8/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/sh/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-binutils.spec
index 00f2377609..55393bfa9d 100644
--- a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-sh-rtems4.8-binutils
 Summary:	Binutils for target sh-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..
 
diff --git a/contrib/crossrpms/rtems4.8/sparc/Makefile.am b/contrib/crossrpms/rtems4.8/sparc/Makefile.am
index 9d50427585..2d5cba0d6b 100644
--- a/contrib/crossrpms/rtems4.8/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.8/sparc/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/mkspec.am
 
 BINUTILS_VERS = 2.18
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2%{?dist}
+BINUTILS_RPMREL = 3%{?dist}
 include ../binutils.am
 BINUTILS_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-binutils.spec b/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-binutils.spec
index 0d9ea0842b..613280c31f 100644
--- a/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-binutils.spec
+++ b/contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-binutils.spec
@@ -21,14 +21,19 @@ Name:		rtems-4.8-sparc-rtems4.8-binutils
 Summary:	Binutils for target sparc-rtems4.8
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{binutils_version}" >= "2.18"
+# Bug in bfd: Doesn't build without texinfo installed
+BuildRequires:	texinfo >= 4.2
+%else
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
+%endif
 BuildRequires:	flex
 BuildRequires:	bison
 
@@ -70,7 +75,7 @@ cd ..
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
 
-  make all
+  make %{?_smp_mflags} all
   make info
   cd ..