Eliminate @PATCH2@, @PATCH4@.

scripts/gcc3newlib/gccnewlib.add

@@ -159,9 +159,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 %prep
 # untar the sources inside %{gcc_target}-gcc-newlib
 %setup -c -T -n %{name}-%{version} -a0 -a1
-
-@PATCH2@
-@PATCH4@
+%{?PATCH0:%patch0 -p0}
+%{?PATCH1:%patch1 -p0}
 
   cd gcc-%{gcc_version}
     sed -e 's/\(version_string = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \

scripts/gcc3newlib/mkspec.in

@@ -52,20 +52,16 @@ patchn=-1
 if test -n "${gcc3_patch_version}"; then
 patchn=`expr $patchn + 1`
 PATCH1="Patch${patchn}: gcc-${gcc3_version}-rtems-${gcc3_patch_version}.diff"
-PATCH2="%patch${patchn} -p0"
 fi
 
 if test -n "${gcc3newlib_patch_version}"; then
 patchn=`expr $patchn + 1`
 PATCH3="Patch${patchn}: newlib-${gcc3newlib_version}-rtems-${gcc3newlib_patch_version}.diff"
-PATCH4="%patch${patchn} -p0"
 fi
 
 # note that the variables in the gcc3newlib directory are actually the same
 sed -e "s,@PATCH1\@,${PATCH1}," \
-    -e "s,@PATCH2\@,${PATCH2}," \
     -e "s,@PATCH3\@,${PATCH3}," \
-    -e "s,@PATCH4\@,${PATCH4}," \
     -e "s%@Release\@%${gcc3newlib_rpm_release}%g" \
     -e "s%@target_alias\@%${target_alias}%g" \
     -e "s%@prefix\@%@prefix@%g" \