[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Thu Nov 29 17:15:30 UTC 2012


Module:    rtems-crossrpms
Branch:    master
Commit:    a916a93f1b1a1a361533227172a9284fb5c14cce
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=a916a93f1b1a1a361533227172a9284fb5c14cce

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Tue Nov 27 15:43:52 2012 +0100

Regenerate.

---

 rtems4.11/arm/Makefile.in                          |    6 +-
 .../arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec |    3 +-
 .../arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec      |   45 +++++++-------------
 .../arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec      |    3 +-
 rtems4.11/avr/Makefile.in                          |    6 +-
 .../avr/rtems-4.11-avr-rtems4.11-binutils.spec     |    3 +-
 rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec    |   36 +++++++--------
 rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec    |    3 +-
 rtems4.11/bfin/Makefile.in                         |    6 +-
 .../bfin/rtems-4.11-bfin-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec  |   45 +++++++-------------
 rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/h8300/Makefile.in                        |    6 +-
 .../h8300/rtems-4.11-h8300-rtems4.11-binutils.spec |    3 +-
 .../h8300/rtems-4.11-h8300-rtems4.11-gcc.spec      |   45 +++++++-------------
 .../h8300/rtems-4.11-h8300-rtems4.11-gdb.spec      |    3 +-
 rtems4.11/i386/Makefile.in                         |    6 +-
 .../i386/rtems-4.11-i386-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec  |   45 +++++++-------------
 rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/lm32/Makefile.in                         |    6 +-
 .../lm32/rtems-4.11-lm32-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec  |   45 +++++++-------------
 rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/m32c/Makefile.in                         |    6 +-
 .../m32c/rtems-4.11-m32c-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec  |   36 +++++++--------
 rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/m32r/Makefile.in                         |    6 +-
 .../m32r/rtems-4.11-m32r-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec  |   45 +++++++-------------
 rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/m68k/Makefile.in                         |    6 +-
 .../m68k/rtems-4.11-m68k-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec  |   45 +++++++-------------
 rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/microblaze/Makefile.in                   |    6 +-
 .../rtems-4.11-microblaze-rtems4.11-binutils.spec  |    3 +-
 .../rtems-4.11-microblaze-rtems4.11-gcc.spec       |   45 +++++++-------------
 .../rtems-4.11-microblaze-rtems4.11-gdb.spec       |    3 +-
 rtems4.11/mips/Makefile.in                         |    8 ++--
 .../mips/rtems-4.11-mips-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec  |   45 +++++++-------------
 rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec  |    7 ++-
 rtems4.11/mipstx39/Makefile.am                     |    4 +-
 rtems4.11/mipstx39/Makefile.in                     |    4 +-
 .../rtems-4.11-mipstx39-rtems4.11-gdb.spec         |    7 ++-
 rtems4.11/powerpc/Makefile.in                      |    6 +-
 .../rtems-4.11-powerpc-rtems4.11-binutils.spec     |    3 +-
 .../powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec  |   45 +++++++-------------
 .../powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/sh/Makefile.in                           |    6 +-
 rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec |    3 +-
 rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec      |   45 +++++++-------------
 rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec      |    3 +-
 rtems4.11/sparc/Makefile.in                        |    6 +-
 .../sparc/rtems-4.11-sparc-rtems4.11-binutils.spec |    3 +-
 .../sparc/rtems-4.11-sparc-rtems4.11-gcc.spec      |   45 +++++++-------------
 .../sparc/rtems-4.11-sparc-rtems4.11-gdb.spec      |    3 +-
 rtems4.11/sparc64/Makefile.in                      |    6 +-
 .../rtems-4.11-sparc64-rtems4.11-binutils.spec     |    3 +-
 .../sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec  |   45 +++++++-------------
 .../sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec  |    3 +-
 rtems4.11/v850/Makefile.in                         |    6 +-
 .../v850/rtems-4.11-v850-rtems4.11-binutils.spec   |    3 +-
 rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec  |   45 +++++++-------------
 rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec  |    3 +-
 67 files changed, 381 insertions(+), 534 deletions(-)

diff --git a/rtems4.11/arm/Makefile.in b/rtems4.11/arm/Makefile.in
index bc28f45..89ae143 100644
--- a/rtems4.11/arm/Makefile.in
+++ b/rtems4.11/arm/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.4.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 8
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
index ac23a26..cfbc6ba 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-arm-rtemseabi4.11-binutils
 Summary:	Binutils for target arm-rtemseabi4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
index bfb3d92..27f1f86 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	arm-rtemseabi4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-arm-rtemseabi4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-arm-rtemseabi4.11-binutils
 Requires:	rtems-4.11-arm-rtemseabi4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-arm-rtemseabi4.11-binutils
-# Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for arm-rtemseabi4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for arm-rtemseabi4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for arm-rtemseabi4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec
index 6504fc3..fdc2f17 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.4.1
 %define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-arm-rtemseabi4.11-gdb
 Summary:	Gdb for target arm-rtemseabi4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/avr/Makefile.in b/rtems4.11/avr/Makefile.in
index 3599f72..a834028 100644
--- a/rtems4.11/avr/Makefile.in
+++ b/rtems4.11/avr/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
index 6ccc3cb..51ee5ee 100644
--- a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
+++ b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-avr-rtems4.11-binutils
 Summary:	Binutils for target avr-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
index dabb2e3..f4debce 100644
--- a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
+++ b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	avr-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-avr-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-avr-rtems4.11-binutils
 Requires:	rtems-4.11-avr-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,35 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
+Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%if "%{gcc_version}" < "4.7.0"
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -370,7 +368,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -654,7 +652,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-avr-rtems4.11-binutils
-# Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -672,7 +670,7 @@ Summary:        libgcc for avr-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-avr-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-avr-rtems4.11-gcc-libgcc
@@ -796,7 +794,7 @@ Summary:      	C Library (newlib) for avr-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -817,7 +815,7 @@ Newlib C Library for avr-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec
index 2721016..79005d9 100644
--- a/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec
+++ b/rtems4.11/avr/rtems-4.11-avr-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-avr-rtems4.11-gdb
 Summary:	Gdb for target avr-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/bfin/Makefile.in b/rtems4.11/bfin/Makefile.in
index 51a1a09..72c7be7 100644
--- a/rtems4.11/bfin/Makefile.in
+++ b/rtems4.11/bfin/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
index 6efd8c5..171d2d3 100644
--- a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
+++ b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-bfin-rtems4.11-binutils
 Summary:	Binutils for target bfin-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
index 77b6aa5..47d07bc 100644
--- a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
+++ b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	bfin-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-bfin-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-bfin-rtems4.11-binutils
 Requires:	rtems-4.11-bfin-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-bfin-rtems4.11-binutils
-# Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for bfin-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-bfin-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-bfin-rtems4.11-gcc-libgcc
@@ -872,7 +859,7 @@ Summary:      	C Library (newlib) for bfin-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -893,7 +880,7 @@ Newlib C Library for bfin-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec
index 6b1ed70..40b5d1b 100644
--- a/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec
+++ b/rtems4.11/bfin/rtems-4.11-bfin-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-bfin-rtems4.11-gdb
 Summary:	Gdb for target bfin-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/h8300/Makefile.in b/rtems4.11/h8300/Makefile.in
index 295303b..cd0a58e 100644
--- a/rtems4.11/h8300/Makefile.in
+++ b/rtems4.11/h8300/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
index 3df9fc8..494f18e 100644
--- a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
+++ b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-h8300-rtems4.11-binutils
 Summary:	Binutils for target h8300-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
index 8934144..af2369b 100644
--- a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
+++ b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	h8300-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-h8300-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-h8300-rtems4.11-binutils
 Requires:	rtems-4.11-h8300-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-h8300-rtems4.11-binutils
-# Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for h8300-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-h8300-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-h8300-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for h8300-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for h8300-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec
index 68cd29b..c63c932 100644
--- a/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec
+++ b/rtems4.11/h8300/rtems-4.11-h8300-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-h8300-rtems4.11-gdb
 Summary:	Gdb for target h8300-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/i386/Makefile.in b/rtems4.11/i386/Makefile.in
index 23f2d44..15f94fe 100644
--- a/rtems4.11/i386/Makefile.in
+++ b/rtems4.11/i386/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.4.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 8
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
index 8fb03e5..c6c3b24 100644
--- a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
+++ b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-i386-rtems4.11-binutils
 Summary:	Binutils for target i386-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
index af0f838..63a334e 100644
--- a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
+++ b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	i386-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-i386-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-i386-rtems4.11-binutils
 Requires:	rtems-4.11-i386-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-i386-rtems4.11-binutils
-# Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for i386-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-i386-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-i386-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for i386-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for i386-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec
index f400294..49073c4 100644
--- a/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec
+++ b/rtems4.11/i386/rtems-4.11-i386-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.4.1
 %define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-i386-rtems4.11-gdb
 Summary:	Gdb for target i386-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/lm32/Makefile.in b/rtems4.11/lm32/Makefile.in
index cd1e163..c54ed8b 100644
--- a/rtems4.11/lm32/Makefile.in
+++ b/rtems4.11/lm32/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.5.4
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 5
+GCC_RPMREL = 6
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 6`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
index e407397..5295447 100644
--- a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
+++ b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-lm32-rtems4.11-binutils
 Summary:	Binutils for target lm32-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
index 4424b0b..dc172c9 100644
--- a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
+++ b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.5.4
 %define gcc_version 4.5.4
@@ -58,7 +59,7 @@ Summary:      	lm32-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	5%{?dist}
+Release:      	6%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-lm32-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-lm32-rtems4.11-binutils
 Requires:	rtems-4.11-lm32-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-11%{?dist}
+Requires:	rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-12%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-5%{?dist}/newlib-%{newlib_version}-11%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-12%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-lm32-rtems4.11-binutils
-# Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-11%{?dist}
+# Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-12%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for lm32-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-11%{?dist}
+Requires:       rtems-4.11-lm32-rtems4.11-newlib = %{newlib_version}-12%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-lm32-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for lm32-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        11%{?dist}
+Release:        12%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for lm32-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        11%{?dist}
+Release:        12%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec
index fe7f1aa..d2fafc5 100644
--- a/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec
+++ b/rtems4.11/lm32/rtems-4.11-lm32-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-lm32-rtems4.11-gdb
 Summary:	Gdb for target lm32-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/m32c/Makefile.in b/rtems4.11/m32c/Makefile.in
index 3f42adf..5589469 100644
--- a/rtems4.11/m32c/Makefile.in
+++ b/rtems4.11/m32c/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
index ab2d999..8847618 100644
--- a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
+++ b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-m32c-rtems4.11-binutils
 Summary:	Binutils for target m32c-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
index 9e7f480..8da055b 100644
--- a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
+++ b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	m32c-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-m32c-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-m32c-rtems4.11-binutils
 Requires:	rtems-4.11-m32c-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,35 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
+Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%if "%{gcc_version}" < "4.7.0"
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -370,7 +368,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -654,7 +652,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-m32c-rtems4.11-binutils
-# Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -672,7 +670,7 @@ Summary:        libgcc for m32c-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-m32c-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-m32c-rtems4.11-gcc-libgcc
@@ -797,7 +795,7 @@ Summary:      	C Library (newlib) for m32c-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -818,7 +816,7 @@ Newlib C Library for m32c-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec
index 166d70a..43cdcb3 100644
--- a/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec
+++ b/rtems4.11/m32c/rtems-4.11-m32c-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-m32c-rtems4.11-gdb
 Summary:	Gdb for target m32c-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/m32r/Makefile.in b/rtems4.11/m32r/Makefile.in
index 136a56b..792214f 100644
--- a/rtems4.11/m32r/Makefile.in
+++ b/rtems4.11/m32r/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
index b0cd16b..4262f70 100644
--- a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
+++ b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-m32r-rtems4.11-binutils
 Summary:	Binutils for target m32r-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
index 2aa77c6..11bf575 100644
--- a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
+++ b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	m32r-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-m32r-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-m32r-rtems4.11-binutils
 Requires:	rtems-4.11-m32r-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-m32r-rtems4.11-binutils
-# Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for m32r-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-m32r-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-m32r-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for m32r-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for m32r-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec
index 0940aff..73d045c 100644
--- a/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec
+++ b/rtems4.11/m32r/rtems-4.11-m32r-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-m32r-rtems4.11-gdb
 Summary:	Gdb for target m32r-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/m68k/Makefile.in b/rtems4.11/m68k/Makefile.in
index 61391d6..356448e 100644
--- a/rtems4.11/m68k/Makefile.in
+++ b/rtems4.11/m68k/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.4.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 8
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
index b86a45e..68098a8 100644
--- a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
+++ b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-m68k-rtems4.11-binutils
 Summary:	Binutils for target m68k-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
index 75db029..cbbc2e5 100644
--- a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
+++ b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	m68k-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-m68k-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-m68k-rtems4.11-binutils
 Requires:	rtems-4.11-m68k-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-m68k-rtems4.11-binutils
-# Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for m68k-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-m68k-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for m68k-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for m68k-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec
index 1b83d02..3be9805 100644
--- a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec
+++ b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.4.1
 %define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-m68k-rtems4.11-gdb
 Summary:	Gdb for target m68k-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/microblaze/Makefile.in b/rtems4.11/microblaze/Makefile.in
index 38794fc..ae9d56b 100644
--- a/rtems4.11/microblaze/Makefile.in
+++ b/rtems4.11/microblaze/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec
index e40e626..28e4897 100644
--- a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec
+++ b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-microblaze-rtems4.11-binutils
 Summary:	Binutils for target microblaze-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec
index c84f3e0..b12505f 100644
--- a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec
+++ b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	microblaze-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-microblaze-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-microblaze-rtems4.11-binutils
 Requires:	rtems-4.11-microblaze-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-microblaze-rtems4.11-binutils
-# Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for microblaze-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-microblaze-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-microblaze-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for microblaze-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for microblaze-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec
index 5c04d01..7922874 100644
--- a/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec
+++ b/rtems4.11/microblaze/rtems-4.11-microblaze-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-microblaze-rtems4.11-gdb
 Summary:	Gdb for target microblaze-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/mips/Makefile.in b/rtems4.11/mips/Makefile.in
index 352b2cd..c923c8e 100644
--- a/rtems4.11/mips/Makefile.in
+++ b/rtems4.11/mips/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -215,9 +215,9 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/target-objc.add \
 	$(top_srcdir)/gcc/target-newlib.add \
 	$(top_srcdir)/gcc/base-newlib.add
-GDB_VERS = 7.4.1
+GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
index 6659bcd..d9725ee 100644
--- a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
+++ b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-mips-rtems4.11-binutils
 Summary:	Binutils for target mips-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
index cf08ed8..bc07338 100644
--- a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
+++ b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	mips-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-mips-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-mips-rtems4.11-binutils
 Requires:	rtems-4.11-mips-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-mips-rtems4.11-binutils
-# Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for mips-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-mips-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-mips-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for mips-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for mips-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec
index ca15ab6..0af5c4b 100644
--- a/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec
+++ b/rtems4.11/mips/rtems-4.11-mips-rtems4.11-gdb.spec
@@ -45,14 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 7.4.1
-%define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
+%{?!el5:%global _with_noarch_subpackages 1}
+%define gdb_version 7.5
+%define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
 Name:		rtems-4.11-mips-rtems4.11-gdb
 Summary:	Gdb for target mips-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/mipstx39/Makefile.am b/rtems4.11/mipstx39/Makefile.am
index 3cdc0a2..ff827e6 100644
--- a/rtems4.11/mipstx39/Makefile.am
+++ b/rtems4.11/mipstx39/Makefile.am
@@ -4,8 +4,8 @@ TARGET = mipstx39-rtems4.11
 include $(top_srcdir)/mkspec.am
 
 # We only want a gdb with a tx39 simulator in it.  We share the other tools
-GDB_VERS = 7.4.1
+GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 8
+GDB_RPMREL = 3
 include ../gdb.am
 GDB_OPTS +=
diff --git a/rtems4.11/mipstx39/Makefile.in b/rtems4.11/mipstx39/Makefile.in
index d0e9632..29fcb6b 100644
--- a/rtems4.11/mipstx39/Makefile.in
+++ b/rtems4.11/mipstx39/Makefile.in
@@ -175,9 +175,9 @@ MKSPEC0 = sed \
 
 
 # We only want a gdb with a tx39 simulator in it.  We share the other tools
-GDB_VERS = 7.4.1
+GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec b/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec
index ad85d34..259e123 100644
--- a/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec
+++ b/rtems4.11/mipstx39/rtems-4.11-mipstx39-rtems4.11-gdb.spec
@@ -45,14 +45,15 @@
 %define _host_rpmprefix %{nil}
 %endif
 
-%define gdb_version 7.4.1
-%define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
+%{?!el5:%global _with_noarch_subpackages 1}
+%define gdb_version 7.5
+%define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
 Name:		rtems-4.11-mipstx39-rtems4.11-gdb
 Summary:	Gdb for target mipstx39-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/powerpc/Makefile.in b/rtems4.11/powerpc/Makefile.in
index ff51429..1289479 100644
--- a/rtems4.11/powerpc/Makefile.in
+++ b/rtems4.11/powerpc/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.4.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 8
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
index ead5e10..9c1dba7 100644
--- a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
+++ b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-powerpc-rtems4.11-binutils
 Summary:	Binutils for target powerpc-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
index 0c8f0ca..76071d5 100644
--- a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
+++ b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	powerpc-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-powerpc-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-powerpc-rtems4.11-binutils
 Requires:	rtems-4.11-powerpc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-powerpc-rtems4.11-binutils
-# Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for powerpc-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-powerpc-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-powerpc-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for powerpc-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for powerpc-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec
index b17357c..e0b8f44 100644
--- a/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec
+++ b/rtems4.11/powerpc/rtems-4.11-powerpc-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.4.1
 %define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-powerpc-rtems4.11-gdb
 Summary:	Gdb for target powerpc-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/sh/Makefile.in b/rtems4.11/sh/Makefile.in
index ae981da..4504f06 100644
--- a/rtems4.11/sh/Makefile.in
+++ b/rtems4.11/sh/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.4.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 8
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
index bd923bd..f53e873 100644
--- a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
+++ b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-sh-rtems4.11-binutils
 Summary:	Binutils for target sh-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
index 821eccb..43a2637 100644
--- a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
+++ b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	sh-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-sh-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-sh-rtems4.11-binutils
 Requires:	rtems-4.11-sh-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-sh-rtems4.11-binutils
-# Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for sh-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-sh-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-sh-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for sh-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for sh-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec
index 68a661c..7960f98 100644
--- a/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec
+++ b/rtems4.11/sh/rtems-4.11-sh-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.4.1
 %define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-sh-rtems4.11-gdb
 Summary:	Gdb for target sh-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/sparc/Makefile.in b/rtems4.11/sparc/Makefile.in
index 0bd918f..b28f625 100644
--- a/rtems4.11/sparc/Makefile.in
+++ b/rtems4.11/sparc/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.4.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 8
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
index cf728a2..07911b4 100644
--- a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
+++ b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-sparc-rtems4.11-binutils
 Summary:	Binutils for target sparc-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
index a47ace6..6751506 100644
--- a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
+++ b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	sparc-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-sparc-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-sparc-rtems4.11-binutils
 Requires:	rtems-4.11-sparc-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-sparc-rtems4.11-binutils
-# Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for sparc-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-sparc-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-sparc-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for sparc-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for sparc-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec
index 91e9322..4f7bdf3 100644
--- a/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec
+++ b/rtems4.11/sparc/rtems-4.11-sparc-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.4.1
 %define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-sparc-rtems4.11-gdb
 Summary:	Gdb for target sparc-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/sparc64/Makefile.in b/rtems4.11/sparc64/Makefile.in
index 42970b4..dd993ad 100644
--- a/rtems4.11/sparc64/Makefile.in
+++ b/rtems4.11/sparc64/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.4.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 7
+GDB_RPMREL = 8
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
index e86955a..58534cd 100644
--- a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
+++ b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-sparc64-rtems4.11-binutils
 Summary:	Binutils for target sparc64-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
index 8bd1ee8..88a5c1b 100644
--- a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
+++ b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	sparc64-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-sparc64-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-sparc64-rtems4.11-binutils
 Requires:	rtems-4.11-sparc64-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-sparc64-rtems4.11-binutils
-# Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for sparc64-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-sparc64-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-sparc64-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for sparc64-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for sparc64-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec
index 57a6cf5..49383d8 100644
--- a/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec
+++ b/rtems4.11/sparc64/rtems-4.11-sparc64-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.4.1
 %define gdb_rpmvers %{expand:%(echo 7.4.1 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-sparc64-rtems4.11-gdb
 Summary:	Gdb for target sparc64-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/v850/Makefile.in b/rtems4.11/v850/Makefile.in
index f74d3f2..2509b13 100644
--- a/rtems4.11/v850/Makefile.in
+++ b/rtems4.11/v850/Makefile.in
@@ -183,7 +183,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.1
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 1
+BINUTILS_RPMREL = 2
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -196,7 +196,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.2
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 3
+GCC_RPMREL = 4
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
@@ -217,7 +217,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.5
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec
index aebbad0..ca2add8 100644
--- a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec
+++ b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-binutils.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define binutils_pkgvers 2.23.1
 %define binutils_version 2.23.1
 %define binutils_rpmvers %{expand:%(echo "2.23.1" | tr - _ )}
@@ -53,7 +54,7 @@ Name:		rtems-4.11-v850-rtems4.11-binutils
 Summary:	Binutils for target v850-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/binutils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
diff --git a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec
index 91572fb..9e33257 100644
--- a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec
+++ b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gcc.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 
 %define gcc_pkgvers 4.7.2
 %define gcc_version 4.7.2
@@ -58,7 +59,7 @@ Summary:      	v850-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	3%{?dist}
+Release:      	4%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -246,7 +247,7 @@ BuildRequires:	rtems-4.11-v850-rtems4.11-binutils
 Requires:	rtems-4.11-gcc-common
 Requires:	rtems-4.11-v850-rtems4.11-binutils
 Requires:	rtems-4.11-v850-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:	rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -259,46 +260,32 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.2"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.2-rtems4.11-20121026.diff
 %endif
 %if "%{gcc_version}" == "4.7.1"
-# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+# Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.1/gcc-4.7.1.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.1-rtems4.11-20120712.diff
 %endif
 %if "%{gcc_version}" == "4.7.0"
-# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.0/gcc-4.7.0.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.7.0-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.6.3.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.3-rtems4.11-20120303.diff
 %endif
-%if "%{gcc_version}" == "4.6.2"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.2-rtems4.11-20120124.diff
-%endif
 %if "%{gcc_version}" == "4.5.4"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-4.5.4.tar.bz2
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-4.5.4.tar.bz2
+Source0:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.5.4.tar.%{?el5:bz2}%{!?el5:xz}
 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.4-rtems4.11-20120703.diff
-%endif
-
-%if "%{gcc_version}" < "4.7.0"
-%if "%{gcc_version}" == "4.6.3"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.6.2"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-%endif
-%if "%{gcc_version}" == "4.5.4"
-Source1:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-4.5.4.tar.bz2
 Patch1:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.4-rtems4.11-20120703.diff
 %endif
 
-%endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20121011.diff
@@ -385,7 +372,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-19%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-4%{?dist}/newlib-%{newlib_version}-20%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -670,7 +657,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.11-v850-rtems4.11-binutils
-# Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+# Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -688,7 +675,7 @@ Summary:        libgcc for v850-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-19%{?dist}
+Requires:       rtems-4.11-v850-rtems4.11-newlib = %{newlib_version}-20%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-v850-rtems4.11-gcc-libgcc
@@ -873,7 +860,7 @@ Summary:      	C Library (newlib) for v850-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -894,7 +881,7 @@ Newlib C Library for v850-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable
 
diff --git a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
index 509b113..cb42f6b 100644
--- a/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
+++ b/rtems4.11/v850/rtems-4.11-v850-rtems4.11-gdb.spec
@@ -45,6 +45,7 @@
 %define _host_rpmprefix %{nil}
 %endif
 
+%{?!el5:%global _with_noarch_subpackages 1}
 %define gdb_version 7.5
 %define gdb_rpmvers %{expand:%(echo 7.5 | tr - _)} 
 
@@ -52,7 +53,7 @@ Name:		rtems-4.11-v850-rtems4.11-gdb
 Summary:	Gdb for target v850-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)




More information about the vc mailing list