Use gcc_* instead of gcc3_* for setup.* values.

scripts/configure.ac

@@ -56,7 +56,7 @@ case "$host" in
 esac
 AC_MSG_RESULT($RPM_CPU)
 
-GCC3NEWLIBVERS="gcc-${gcc3_version}-newlib-${gcc3newlib_version}"
+GCC3NEWLIBVERS="gcc-${gcc_version}-newlib-${gcc3newlib_version}"
 AC_SUBST(GCC3NEWLIBVERS)
 BINUTILSVERS="binutils-${binutils_version}"
 AC_SUBST(BINUTILSVERS)

scripts/gcc3newlib/mkspec.in

@@ -49,9 +49,9 @@ target_alias=$1
 . ./$CFG
 
 patchn=-1
-if test -n "${gcc3_patch_version}"; then
+if test -n "${gcc_patch_version}"; then
 patchn=`expr $patchn + 1`
-PATCH1="Patch${patchn}: gcc-${gcc3_version}-rtems-${gcc3_patch_version}.diff"
+PATCH1="Patch${patchn}: gcc-${gcc_version}-rtems-${gcc_patch_version}.diff"
 fi
 
 if test -n "${gcc3newlib_patch_version}"; then
@@ -69,9 +69,9 @@ sed -e "s,@PATCH1\@,${PATCH1}," \
     -e "s%@rpmgroup\@%@rpmgroup@%g" \
     -e "s%@osversion\@%@osversion@%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
-    -e "s%@gcc_version\@%${gcc3_version}%g" \
-    -e "s%@gcc_patch_version\@%${gcc3_patch_version}%g" \
-    -e "s%@gcc_suffix\@%${gcc3_suffix}%g" \
+    -e "s%@gcc_version\@%${gcc_version}%g" \
+    -e "s%@gcc_patch_version\@%${gcc_patch_version}%g" \
+    -e "s%@gcc_suffix\@%${gcc_suffix}%g" \
     -e "s%@newlib_version\@%${gcc3newlib_version}%g" \
     -e "s%@newlib_patch_version\@%${gcc3newlib_patch_version}%g" \
     -e "s%@newlib_suffix\@%${gcc3newlib_suffix}%g" \

scripts/setup

@@ -32,8 +32,8 @@ do
   echo "b rtems version           : $rtems_version"
   echo "c rtems rpm release       : $rtems_rpm_release"
   echo "d rpm build root          : $rpm_build_root"
-  echo "e gcc3 version             : $gcc3_version"
-  echo "f gcc3 patch version       : $gcc3_patch_version"
+  echo "e gcc3 version             : $gcc_version"
+  echo "f gcc3 patch version       : $gcc_patch_version"
   echo "g gcc3 newlib version      : $gcc3newlib_version"
   echo "h gcc3 newlib patch version: $gcc3newlib_patch_version"
   echo "i gcc3/newlib rpm release  : $gcc3newlib_rpm_release"
@@ -61,9 +61,9 @@ do
   d) echo -n "RPM build root >"
      read rpm_build_root ;;
   e) echo -n "GCC3 source >"
-     read gcc3_version ;;
+     read gcc_version ;;
   f) echo -n "GCC3 patch version>"
-     read gcc3_patch_version ;;
+     read gcc_patch_version ;;
   g) echo -n "NEWLIB source >"
      read gcc3newlib_version ;;
   h) echo -n "NEWLIB patch version>"
@@ -98,8 +98,8 @@ echo "rtems_rpm_release=$rtems_rpm_release" >> $CFG
 echo "rpm_build_root=$rpm_build_root" >> $CFG
 echo "gcc3newlib_version=$gcc3newlib_version" >> $CFG
 echo "gcc3newlib_patch_version=$gcc3newlib_patch_version" >> $CFG
-echo "gcc3_version=$gcc3_version" >> $CFG
-echo "gcc3_patch_version=$gcc3_patch_version" >> $CFG
+echo "gcc_version=$gcc_version" >> $CFG
+echo "gcc_patch_version=$gcc_patch_version" >> $CFG
 echo "gcc3newlib_rpm_release=$gcc3newlib_rpm_release" >> $CFG
 
 echo " done"

scripts/setup.def

@@ -16,10 +16,7 @@ rpm_build_root=%{_tmppath}
 gcc3newlib_version=1.12.0
 gcc3newlib_suffix=.tar.gz
 gcc3newlib_patch_version=
-gcc3_version=3.3.5
-gcc3_suffix=.tar.gz
-gcc3_patch_version=20041030
+gcc_version=3.3.5
+gcc_suffix=.tar.gz
+gcc_patch_version=20041030
 gcc3newlib_rpm_release=2
-# gcc3_version=3.4.0
-# gcc3_patch_version=20040522a
-# gcc3newlib_rpm_release=2