Eliminate @PATCH2@.

scripts/binutils/binutils.add

@@ -39,7 +39,7 @@ Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_version}@binutil
 
 %prep
 %setup -c -n %{name}-%{version}
-@PATCH2@
+%{?PATCH0:%patch0 -p0}
   test -d build || mkdir build
 
 %build

scripts/binutils/mkspec.in

@@ -50,7 +50,6 @@ target_alias=$1
 
 if test -n "${binutils_patch_version}"; then
 PATCH1="Patch0: binutils-${binutils_version}-rtems-${binutils_patch_version}.diff"
-PATCH2="%patch0 -p0"
 fi
 
 sed -e "s%@Release\@%${binutils_rpm_release}%g" \
@@ -64,5 +63,4 @@ sed -e "s%@Release\@%${binutils_rpm_release}%g" \
     -e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \
     -e "s%@binutils_suffix\@%${binutils_suffix}%g" \
     -e "s,@PATCH1\@,${PATCH1}," \
-    -e "s,@PATCH2\@,${PATCH2}," \
 < ${specsrc}

scripts/gdb/gdb.add

@@ -20,7 +20,7 @@ Patch1:	      gdb-%{gdb_version}-rtems-cg-@gdb_patch_version@.diff
 Patch2:	      gdb-%{gdb_version}-rtems-rdbg-@gdb_patch_version@.diff
 %else
 Source0:      ftp://ftp.gnu.org/pub/gnu/gdb-%{gdb_version}.tar.bz2
-Patch0:	      gdb-%{gdb_version}-rtems-@gdb_patch_version@.diff
+@PATCH1@
 %endif
 
 %if "%{_vendor}" == "redhat"
@@ -61,9 +61,9 @@ This is the GNU gdb for RTEMS targetting %{gdb_version}.
 %setup -c -n %{name}-%{version} -a 0
 
 cd gdb-%{gdb_version}
-%patch0 -p1
-# %patch1 -p1
-# %patch2 -p1
+%{?PATCH0:%patch0 -p1}
+%{?PATCH1:%patch1 -p1}
+%{?PATCH2:%patch2 -p1}
 
 %build
 %if "%_sim" == "1"

scripts/gdb/mkspec.in

@@ -52,11 +52,9 @@ patchn=-1
 if test -n "${gdb_patch_version}"; then
 patchn=`expr $patchn + 1`
 PATCH1="Patch${patchn}: gdb-${gdb_version}-rtems-${gdb_patch_version}.diff"
-PATCH2="%patch${patchn} -p0"
 fi
 
 sed -e "s,@PATCH1\@,${PATCH1}," \
-    -e "s,@PATCH2\@,${PATCH2}," \
     -e "s%@Release\@%${gdb_rpm_release}%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
     -e "s%@prefix\@%@prefix@%g" \