Sync.

10 files changed, 50 insertions, 82 deletions

diff --git a/contrib/crossrpms/rtems4.7/arm/gcc-sources.add b/contrib/crossrpms/rtems4.7/arm/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/arm/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/arm/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/avr/gcc-sources.add b/contrib/crossrpms/rtems4.7/avr/gcc-sources.add
index 6f9197eb48..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/avr/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/avr/gcc-sources.add
@@ -1,42 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
-# Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%if "%{gcc_version}" == "4.1.1"
+Patch0:		gcc-core-4.1.1-rtems-20060626.diff
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
+%if "%{newlib_version}" == "1.14.1"
 Patch50:	newlib-1.14.0-rtems-20060704.diff
-# @PATCH50@
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/h8300/gcc-sources.add b/contrib/crossrpms/rtems4.7/h8300/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/h8300/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/h8300/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/i386/gcc-sources.add b/contrib/crossrpms/rtems4.7/i386/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/i386/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/i386/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/m68k/gcc-sources.add b/contrib/crossrpms/rtems4.7/m68k/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/m68k/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/m68k/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/mips/gcc-sources.add b/contrib/crossrpms/rtems4.7/mips/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/mips/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/mips/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/powerpc/gcc-sources.add b/contrib/crossrpms/rtems4.7/powerpc/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/powerpc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/powerpc/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/sh/gcc-sources.add b/contrib/crossrpms/rtems4.7/sh/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/sh/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/sh/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/sparc/gcc-sources.add b/contrib/crossrpms/rtems4.7/sparc/gcc-sources.add
index 53bb404950..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/sparc/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/sparc/gcc-sources.add
@@ -1,41 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
+%if "%{gcc_version}" == "4.1.1"
 Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
-@PATCH50@
+%if "%{newlib_version}" == "1.14.1"
+Patch50:	newlib-1.14.0-rtems-20060704.diff
+%endif
 %{?_without_sources:NoSource:	50}
 %endif
diff --git a/contrib/crossrpms/rtems4.7/tic4x/gcc-sources.add b/contrib/crossrpms/rtems4.7/tic4x/gcc-sources.add
index 6f9197eb48..62c411261e 100644
--- a/contrib/crossrpms/rtems4.7/tic4x/gcc-sources.add
+++ b/contrib/crossrpms/rtems4.7/tic4x/gcc-sources.add
@@ -1,42 +1,38 @@
 Source0: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
-# Patch0:		gcc-4.1.0-rtems-mips.diff
-# Patch0:		gcc-core-4.1.1-rtems-20060626.diff
-# @PATCH0@
+%if "%{gcc_version}" == "4.1.1"
+Patch0:		gcc-core-4.1.1-rtems-20060626.diff
+%endif
 %{?_without_sources:NoSource:	0}
 
 %if %build_cxx
 Source1: 	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_pkgvers}.tar.bz2
-@PATCH1@
 %{?_without_sources:NoSource:	1}
 %endif
 
 %if %build_f95
 Source2:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2
-@PATCH2@
 %{?_without_sources:NoSource:	2}
 %endif
 
 %if %build_gcj
 Source3:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2
-@PATCH3@
 %{?_without_sources:NoSource:	3}
 %endif
 
 %if %build_gnat
 Source4:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2
-@PATCH4@
 %{?_without_sources:NoSource:	4}
 %endif
  
 %if %build_objc
 Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2
-@PATCH5@
 %{?_without_sources:NoSource:	5}
 %endif
 
 %if %build_newlib
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
+%if "%{newlib_version}" == "1.14.1"
 Patch50:	newlib-1.14.0-rtems-20060704.diff
-# @PATCH50@
+%endif
 %{?_without_sources:NoSource:	50}
 %endif