Regenerate.

15 files changed, 89 insertions, 59 deletions

diff --git a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-binutils.spec b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-binutils.spec
index 5da5700945..ed9354b38b 100644
--- a/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/arm-eabi/rtems-4.11-arm-rtemseabi4.11-binutils.spec
@@ -45,9 +45,9 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-arm-rtemseabi4.11-binutils
 Summary:	Binutils for target arm-rtemseabi4.11
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target arm-rtemseabi4.11
diff --git a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
index aab3269adf..a3a7d8adfa 100644
--- a/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-arm-rtems4.11-binutils
 Summary:	Binutils for target arm-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target arm-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
index d513cb0808..56918b309e 100644
--- a/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-avr-rtems4.11-binutils
 Summary:	Binutils for target avr-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target avr-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
index 7446c1fdf7..c6fb6ec317 100644
--- a/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-bfin-rtems4.11-binutils
 Summary:	Binutils for target bfin-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target bfin-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
index 2163f6d3d3..38ea307059 100644
--- a/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-h8300-rtems4.11-binutils
 Summary:	Binutils for target h8300-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target h8300-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
index 5bbbfbdc2a..cf2fc06acd 100644
--- a/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-i386-rtems4.11-binutils
 Summary:	Binutils for target i386-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target i386-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
index 58ce9b67ca..650080dd01 100644
--- a/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-lm32-rtems4.11-binutils
 Summary:	Binutils for target lm32-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target lm32-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
index ed8c6fad3f..8077aafa25 100644
--- a/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-m32c-rtems4.11-binutils
 Summary:	Binutils for target m32c-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target m32c-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
index bd1acfce44..40b1871124 100644
--- a/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-m32r-rtems4.11-binutils
 Summary:	Binutils for target m32r-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target m32r-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
index 21d6e49b42..4fe195f6fd 100644
--- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-m68k-rtems4.11-binutils
 Summary:	Binutils for target m68k-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target m68k-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
index 36aec9a4ed..263a58d6cb 100644
--- a/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-mips-rtems4.11-binutils
 Summary:	Binutils for target mips-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target mips-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
index 65c0ab7bc1..9ac4855b98 100644
--- a/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-powerpc-rtems4.11-binutils
 Summary:	Binutils for target powerpc-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target powerpc-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
index e5de636339..91016e034f 100644
--- a/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-sh-rtems4.11-binutils
 Summary:	Binutils for target sh-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target sh-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
index 3a2e17851e..5e17222ecc 100644
--- a/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-sparc-rtems4.11-binutils
 Summary:	Binutils for target sparc-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target sparc-rtems4.11
diff --git a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
index 960a6b8f98..447d048b3b 100644
--- a/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
+++ b/contrib/crossrpms/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
@@ -45,15 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define binutils_pkgvers 2.21
-%define binutils_version 2.21
-%define binutils_rpmvers %{expand:%(echo "2.21" | tr - _ )}
+%define binutils_pkgvers 2.21.1
+%define binutils_version 2.21.1
+%define binutils_rpmvers %{expand:%(echo "2.21.1" | tr - _ )}
 
 Name:		rtems-4.11-sparc64-rtems4.11-binutils
 Summary:	Binutils for target sparc64-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,7 +74,9 @@ BuildRequires:	bison
 Requires:	rtems-4.11-binutils-common
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
+%if "%{binutils_version}" == "2.21"
 Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.21-rtems4.11-20110107.diff
+%endif
 
 %description
 Cross binutils for target sparc64-rtems4.11