2003-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* binutils/base-binutils.add: Add osversion support.
	* binutils/binutils.add: Add osversion support.
	%setup -n %{name}-%{version}.
	Don't remove c++filt.
	* binutils/target-binutils.add: Add osversion support.
	Pickup c++filt.
	* gcc3newlib/base-g77.add: Add osversion support.
	* gcc3newlib/base-gcc.add: Add osversion support.
	* gcc3newlib/base-gcj.add: Add osversion support.
	* gcc3newlib/base-gnat.add: Add osversion support.
	* gcc3newlib/gccnewlib.add: Add osversion support.
	Remove c++filt,
	%setup -n -n %{name}-%{version}.
	* gcc3newlib/target-c++.add: Add osversion support.
	Don't pickup c++filt.
	* gcc3newlib/target-g77.add: Add osversion support.
	* gcc3newlib/target-gcc.add: Add osversion support.
	* gcc3newlib/target-gcj.add: Add osversion support.
	* gcc3newlib/target-gnat.add: Add osversion support.
	* gccnewlib/gccnewlib.add: %setup -n %{name}-%{version}.
	* gdb/base-gdb.add: Add osversion support, rpmgroup, rpmprefix,
	gdb_version, gdb_target.
	* gdb/target-gdb.add: Ditto.
	* gdb/gdb.add: Ditto.
	%setup -n -n %{name}-%{version}.

18 files changed, 125 insertions, 102 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index bc6c0cf2e4..41814aa9e3 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,33 @@
 2003-09-04	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* binutils/base-binutils.add: Add osversion support.
+	* binutils/binutils.add: Add osversion support.
+	%setup -n %{name}-%{version}.
+	Don't remove c++filt.
+	* binutils/target-binutils.add: Add osversion support.
+	Pickup c++filt.
+	* gcc3newlib/base-g77.add: Add osversion support.
+	* gcc3newlib/base-gcc.add: Add osversion support.
+	* gcc3newlib/base-gcj.add: Add osversion support.
+	* gcc3newlib/base-gnat.add: Add osversion support.
+	* gcc3newlib/gccnewlib.add: Add osversion support.
+	Remove c++filt,
+	%setup -n -n %{name}-%{version}.
+	* gcc3newlib/target-c++.add: Add osversion support.
+	Don't pickup c++filt.
+	* gcc3newlib/target-g77.add: Add osversion support.
+	* gcc3newlib/target-gcc.add: Add osversion support.
+	* gcc3newlib/target-gcj.add: Add osversion support.
+	* gcc3newlib/target-gnat.add: Add osversion support.
+	* gccnewlib/gccnewlib.add: %setup -n %{name}-%{version}.
+	* gdb/base-gdb.add: Add osversion support, rpmgroup, rpmprefix,
+	gdb_version, gdb_target.
+	* gdb/target-gdb.add: Ditto.
+	* gdb/gdb.add: Ditto.
+	%setup -n -n %{name}-%{version}.
+
+2003-09-04	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* binutils/Makefile.am: Fix osversion support for sh-rtemself.
 	* gcc3newlib/Makefile.am: Fix osversion support for sh-rtemself.
 
diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add
index 21644618a2..c7e555f0ad 100644
--- a/scripts/binutils/base-binutils.add
+++ b/scripts/binutils/base-binutils.add
@@ -1,18 +1,18 @@
 # ==============================================================
 # rtems-base-binutils
 # ==============================================================
-%package -n %{rpmprefix}rtems-base-binutils
+%package -n %{rpmprefix}rtems@osversion@-base-binutils
 Summary:      base package for rtems binutils
 Group: %{rpmgroup}
 PreReq:		/sbin/install-info
 
-%description -n %{rpmprefix}rtems-base-binutils
+%description -n %{rpmprefix}rtems@osversion@-base-binutils
 
 RTEMS is an open source operating system for embedded systems.
 
 This is the base for binutils regardless of target CPU.
 
-%post -n %{rpmprefix}rtems-base-binutils
+%post -n %{rpmprefix}rtems@osversion@-base-binutils
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -22,7 +22,7 @@ This is the base for binutils regardless of target CPU.
     done
   fi
 
-%postun -n %{rpmprefix}rtems-base-binutils
+%postun -n %{rpmprefix}rtems@osversion@-base-binutils
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -32,7 +32,7 @@ This is the base for binutils regardless of target CPU.
     done
   fi
 
-%files -n %{rpmprefix}rtems-base-binutils -f files
+%files -n %{rpmprefix}rtems@osversion@-base-binutils -f files
 %defattr(-,root,root)
 %dir %{_prefix}/info
 %doc %{_prefix}/info/dir
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index e811d33a99..4c303331c3 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -38,8 +38,7 @@ RTEMS is an open source operating system for embedded systems.
 This is binutils sources with patches for RTEMS.
 
 %prep
-# untar the sources inside %{binutils_target}-binutils
-%setup -c -n %{binutils_target}-binutils
+%setup -c -n %{name}-%{version}
 @PATCH2@
   test -d build || mkdir build
 
@@ -63,7 +62,7 @@ This is binutils sources with patches for RTEMS.
   ../binutils-%{binutils_version}/mkinstalldirs \
     $RPM_BUILD_ROOT%{_prefix}/share/locale
 
-  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
+#  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
 # gzip info files
   gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
   gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info-* 2>/dev/null
diff --git a/scripts/binutils/target-binutils.add b/scripts/binutils/target-binutils.add
index 7cd9da0a85..6694671321 100644
--- a/scripts/binutils/target-binutils.add
+++ b/scripts/binutils/target-binutils.add
@@ -4,7 +4,7 @@
 %package -n %{rpmprefix}%{binutils_target}-binutils
 Summary:      rtems binutils for %{binutils_target}
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems-base-binutils
+Requires: %{rpmprefix}rtems@osversion@-base-binutils
 Autoreqprov:  	off
 
 %description -n %{rpmprefix}%{binutils_target}-binutils
@@ -21,10 +21,11 @@ This is the GNU binutils for RTEMS targetting %{binutils_target}.
 %{_prefix}/bin/%{binutils_target}-addr2line%{_exeext}
 %{_prefix}/bin/%{binutils_target}-ar%{_exeext}
 %{_prefix}/bin/%{binutils_target}-as%{_exeext}
-# c++filt now comes from gcc
-# %{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
+%{_prefix}/bin/%{binutils_target}-c++filt%{_exeext}
+%if "%{binutils_version}" < "2.13"
 # deleted as of 2.13
-# %{_prefix}/bin/%{binutils_target}-gasp%{_exeext}
+%{_prefix}/bin/%{binutils_target}-gasp%{_exeext}
+%endif
 %{_prefix}/bin/%{binutils_target}-ld%{_exeext}
 %{_prefix}/bin/%{binutils_target}-nm%{_exeext}
 %{_prefix}/bin/%{binutils_target}-objcopy%{_exeext}
diff --git a/scripts/gcc3newlib/base-g77.add b/scripts/gcc3newlib/base-g77.add
index 06f96e8e61..1500007930 100644
--- a/scripts/gcc3newlib/base-g77.add
+++ b/scripts/gcc3newlib/base-g77.add
@@ -2,17 +2,17 @@
 # ==============================================================
 # rtems-base-g77
 # ==============================================================
-%package -n %{rpmprefix}rtems-base-g77
+%package -n %{rpmprefix}rtems@osversion@-base-g77
 Summary:      rtems base package for gcc/g77 compiler
 Group: %{rpmgroup}
 Requires: rtems-base-gcc
 
-%description -n %{rpmprefix}rtems-base-g77
+%description -n %{rpmprefix}rtems@osversion@-base-g77
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc/g77 that are shared by all targets.
 
-%files -n %{rpmprefix}rtems-base-g77
+%files -n %{rpmprefix}rtems@osversion@-base-g77
 %defattr(-,root,root)
 %dir %{_prefix}/info
 %doc %{_prefix}/info/g77.info*.gz
@@ -21,7 +21,7 @@ This is the files for gcc/g77 that are shared by all targets.
 %dir %{_prefix}/man/man1
 %doc %{_prefix}/man/man1/%{gcc_target}-g77.1*
 
-%post -n %{rpmprefix}rtems-base-g77
+%post -n %{rpmprefix}rtems@osversion@-base-g77
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -31,7 +31,7 @@ This is the files for gcc/g77 that are shared by all targets.
     done
   fi
 
-%postun -n %{rpmprefix}rtems-base-g77
+%postun -n %{rpmprefix}rtems@osversion@-base-g77
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
diff --git a/scripts/gcc3newlib/base-gcc.add b/scripts/gcc3newlib/base-gcc.add
index f628b8d50c..27d0288929 100644
--- a/scripts/gcc3newlib/base-gcc.add
+++ b/scripts/gcc3newlib/base-gcc.add
@@ -1,17 +1,17 @@
 # ==============================================================
-# %{rpmprefix}rtems-base-gcc
+# %{rpmprefix}rtems@osversion@-base-gcc
 # ==============================================================
-%package -n %{rpmprefix}rtems-base-gcc
+%package -n %{rpmprefix}rtems@osversion@-base-gcc
 Summary:      	base package for rtems gcc and newlib C Library 
 Group: %{rpmgroup}
 
-%description -n %{rpmprefix}rtems-base-gcc
+%description -n %{rpmprefix}rtems@osversion@-base-gcc
 
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc and newlib that are shared by all targets.
 
-%files -n %{rpmprefix}rtems-base-gcc
+%files -n %{rpmprefix}rtems@osversion@-base-gcc
 %defattr(-,root,root)
 %dir %{_prefix}/info
 %doc %{_prefix}/info/cpp.info*.gz
@@ -32,7 +32,7 @@ This is the files for gcc and newlib that are shared by all targets.
 
 %dir %{_prefix}/include
 
-%post -n %{rpmprefix}rtems-base-gcc
+%post -n %{rpmprefix}rtems@osversion@-base-gcc
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
@@ -42,7 +42,7 @@ This is the files for gcc and newlib that are shared by all targets.
     done
   fi
 
-%postun -n %{rpmprefix}rtems-base-gcc
+%postun -n %{rpmprefix}rtems@osversion@-base-gcc
   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; 
   then
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
diff --git a/scripts/gcc3newlib/base-gcj.add b/scripts/gcc3newlib/base-gcj.add
index 93d4f9f25d..7fdb6c18d1 100644
--- a/scripts/gcc3newlib/base-gcj.add
+++ b/scripts/gcc3newlib/base-gcj.add
@@ -2,17 +2,17 @@
 # ==============================================================
 # rtems-base-gcj
 # ==============================================================
-%package -n %{rpmprefix}rtems-base-gcj
+%package -n %{rpmprefix}rtems@osversion@-base-gcj
 Summary:      base package for rtems gcc/java compiler (gcj).
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems-base-gcc
+Requires: %{rpmprefix}rtems@osversion@-base-gcc
 
-%description -n %{rpmprefix}rtems-base-gcj
+%description -n %{rpmprefix}rtems@osversion@-base-gcj
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc/java (gcj) that are shared by all targets.
 
-%files -n %{rpmprefix}rtems-base-gcj
+%files -n %{rpmprefix}rtems@osversion@-base-gcj
 %defattr(-,root,root)
 %dir %{_prefix}/bin
 %{_prefix}/bin/jar%{_exeext}
diff --git a/scripts/gcc3newlib/base-gnat.add b/scripts/gcc3newlib/base-gnat.add
index 451994596a..090d187615 100644
--- a/scripts/gcc3newlib/base-gnat.add
+++ b/scripts/gcc3newlib/base-gnat.add
@@ -2,16 +2,16 @@
 # ==============================================================
 # rtems-base-gnat
 # ==============================================================
-%package -n %{rpmprefix}rtems-base-gnat
+%package -n %{rpmprefix}rtems@osversion@-base-gnat
 Summary:	gcc/gnat tools
 Group: %{rpmgroup}
 
-%description -n %{rpmprefix}rtems-base-gnat
+%description -n %{rpmprefix}rtems@osversion@-base-gnat
 RTEMS is an open source operating system for embedded systems.
 
 This is the gcc/gnat tools for the gcc/gnat compiler
 
-%files -n %{rpmprefix}rtems-base-gnat
+%files -n %{rpmprefix}rtems@osversion@-base-gnat
 %defattr(-,root,root)
 %dir %{_prefix}/bin
 # %{_prefix}/bin/gnat*
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index 66a77139ba..098953708d 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -71,38 +71,38 @@ NoSource:	1
 %define build_gcj	0
 %define build_gnat	0
 
-%if "%{gcc_target}" == "arm-rtems"
+%if "%{gcc_target}" == "arm-rtems@osversion@"
 %define build_gcj	%_gcj
 %endif
 
-%if "%{gcc_target}" == "c4x-rtems"
+%if "%{gcc_target}" == "c4x-rtems@osversion@"
 %define build_cxx	0
 %endif
 
-%if "%{gcc_target}" == "i386-rtems"
+%if "%{gcc_target}" == "i386-rtems@osversion@"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
 
-%if "%{gcc_target}" == "i960-rtems"
+%if "%{gcc_target}" == "i960-rtems@osversion@"
 %define build_cxx	0
 %endif
 
-%if "%{gcc_target}" == "m68k-rtems"
+%if "%{gcc_target}" == "m68k-rtems@osversion@"
 %define build_gcj	%_gcj
 %endif
 
-%if "%{gcc_target}" == "mips-rtems"
+%if "%{gcc_target}" == "mips-rtems@osversion@"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
 
-%if "%{gcc_target}" == "powerpc-rtems"
+%if "%{gcc_target}" == "powerpc-rtems@osversion@"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
 
-%if "%{gcc_target}" == "sparc-rtems"
+%if "%{gcc_target}" == "sparc-rtems@osversion@"
 %define build_gnat      %_gnat
 %define build_gcj	%_gcj
 %endif
@@ -140,7 +140,7 @@ 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} -a0 -a1
+%setup -c -T -n %{name}-%{version} -a0 -a1
 
 @PATCH2@
 @PATCH4@
@@ -199,11 +199,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h
 %endif
 
-%if %build_cxx
-%if "%{gcc_version}" >= "3.3"
-  make -C %{gcc_target}/libiberty CFLAGS="$RPM_OPT_FLAGS" c++filt
-%endif
-%endif
+  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
 
 %if %build_gnat
   cd ../gcc-%{gcc_version}/gcc/ada
@@ -230,11 +226,12 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../newlib-%{newlib_version}/newlib/libc/include"
 # Without this xgcc doesn't find the target's binutils.
   GNATLIBCFLAGS="$GNATLIBCFLAGS -B%{_prefix}/%{gcc_target}/bin/"
-%if "%{gcc_target}" == "mips-rtems"
+%if "%{gcc_target}" == "mips-rtems@osversion@"
   GNATLIBCFLAGS="$GNATLIBCFLAGS -G0"
 %endif
   make -C gcc GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib
 %endif
+
   make info
 
 %install
@@ -268,6 +265,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   # host library
   rm -f  ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
 
+%if "%{gcc_version}" < "3.3"
+  # We use the version from binutils
+  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
+%endif
+
 %if "%{gcc_version}" < "3.0"
   # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
   # Rename it to target_alias-cpp
@@ -278,14 +280,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   fi
 %endif
 
-%if %build_cxx
-%if "%{gcc_version}" >= "3.3"
-  install -d $RPM_BUILD_ROOT%{_prefix}/bin
-  install -c -m 755 %{gcc_target}/libiberty/c++filt%{_exeext} \
-     $RPM_BUILD_ROOT%{_prefix}/bin/%{target_alias}-c++filt%{_exeext}
-%endif
-%endif
-
   # gzip info files
   gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
 %if "%{gcc_version}" < "3.3"
diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add
index e2fe80a86b..e96f876f42 100644
--- a/scripts/gcc3newlib/target-c++.add
+++ b/scripts/gcc3newlib/target-c++.add
@@ -5,7 +5,7 @@
 %package -n %{rpmprefix}%{gcc_target}-c++
 Summary:      gcc/g++ compiler (c++) for %{gcc_target}
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems-base-gcc %{rpmprefix}%{gcc_target}-gcc
+Requires: %{rpmprefix}rtems@osversion@-base-gcc %{rpmprefix}%{gcc_target}-gcc
 
 %description -n %{rpmprefix}%{gcc_target}-c++
 RTEMS is an open source operating system for embedded systems.
@@ -19,7 +19,6 @@ This is the gcc/g++ compiler for %{gcc_target}
 %dir %{_prefix}/bin
 %{_prefix}/bin/%{gcc_target}-c++%{_exeext}
 %{_prefix}/bin/%{gcc_target}-g++%{_exeext}
-%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
 
 %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
 %dir %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include
diff --git a/scripts/gcc3newlib/target-g77.add b/scripts/gcc3newlib/target-g77.add
index 0e2b696855..bbf5c07fbd 100644
--- a/scripts/gcc3newlib/target-g77.add
+++ b/scripts/gcc3newlib/target-g77.add
@@ -5,7 +5,7 @@
 %package -n %{rpmprefix}%{gcc_target}-g77
 Summary:	gcc/g77 compiler for %{gcc_target}
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems-base-g77 %{rpmprefix}%{gcc_target}-gcc
+Requires: %{rpmprefix}rtems@osversion@-base-g77 %{rpmprefix}%{gcc_target}-gcc
 
 %description -n %{rpmprefix}%{gcc_target}-g77
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gcc3newlib/target-gcc.add b/scripts/gcc3newlib/target-gcc.add
index 161d902524..b2f48ff091 100644
--- a/scripts/gcc3newlib/target-gcc.add
+++ b/scripts/gcc3newlib/target-gcc.add
@@ -4,7 +4,7 @@
 %package -n %{rpmprefix}%{gcc_target}-gcc
 Summary:      	rtems gcc and newlib C Library for %{gcc_target}
 Group: %{rpmgroup}
-Requires: %{rpmprefix}%{gcc_target}-binutils %{rpmprefix}rtems-base-gcc
+Requires: %{rpmprefix}%{gcc_target}-binutils %{rpmprefix}rtems@osversion@-base-gcc
 
 %description -n %{rpmprefix}%{gcc_target}-gcc
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gcc3newlib/target-gcj.add b/scripts/gcc3newlib/target-gcj.add
index d1a5e6b9c2..1f32281e6f 100644
--- a/scripts/gcc3newlib/target-gcj.add
+++ b/scripts/gcc3newlib/target-gcj.add
@@ -5,7 +5,7 @@
 %package -n %{rpmprefix}%{gcc_target}-gcj
 Summary:      gcc/java compiler (gcj) for %{gcc_target}
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems-base-gcj %{rpmprefix}%{gcc_target}-gcc
+Requires: %{rpmprefix}rtems@osversion@-base-gcj %{rpmprefix}%{gcc_target}-gcc
 
 %description -n %{rpmprefix}%{gcc_target}-gcj
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gcc3newlib/target-gnat.add b/scripts/gcc3newlib/target-gnat.add
index 6e9d1166a0..ccd1670b09 100644
--- a/scripts/gcc3newlib/target-gnat.add
+++ b/scripts/gcc3newlib/target-gnat.add
@@ -5,7 +5,7 @@
 %package -n %{rpmprefix}%{gcc_target}-gnat
 Summary:	gcc/gnat compiler for %{gcc_target}
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems-base-gnat %{rpmprefix}%{gcc_target}-gcc
+Requires: %{rpmprefix}rtems@osversion@-base-gnat %{rpmprefix}%{gcc_target}-gcc
 
 %description -n %{rpmprefix}%{gcc_target}-gnat
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index 6921882ac2..9959b3222c 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -47,7 +47,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 
 %prep
 # untar the sources inside @target_alias@-gcc-newlib
-%setup -c -n %{name} -a 0 -a 1
+%setup -c -n %{name}-%{version} -a 0 -a 1
 
 %patch0 -p0
 %patch1 -p0
diff --git a/scripts/gdb/base-gdb.add b/scripts/gdb/base-gdb.add
index 5698484788..d98040486f 100644
--- a/scripts/gdb/base-gdb.add
+++ b/scripts/gdb/base-gdb.add
@@ -2,30 +2,29 @@
 # rtems-base-gdb
 # =====================================================================
 
-%package -n rtems-base-gdb
-Provides:	rtems-base-gdb
+%package -n %{rpmprefix}rtems@osversion@-base-gdb
 Summary:      base package for rtems gdb
-Group: rtems
+Group: %{rpmgroup}
 
-%description -n rtems-base-gdb
+%description -n %{rpmprefix}rtems@osversion@-base-gdb
 
 RTEMS is an open source operating system for embedded systems.
 
 This is the base for gdb regardless of target CPU.
 
-%files -n rtems-base-gdb
+%files -n %{rpmprefix}rtems@osversion@-base-gdb
 %defattr(-,root,root)
 
 %dir %{_prefix}/info
 %doc %{_prefix}/info/gdb.info*
 %doc %{_prefix}/info/mmalloc.info*
 # FIXME: When had gdbint and stabs been introduced?
-%if "@gdb_version@" >= "5.0"
+%if "%{gdb_version}" >= "5.0"
 %doc %{_prefix}/info/gdbint.info*
 %doc %{_prefix}/info/stabs.info*
 %endif
 # gdb 4.18 installed this, gdb 5.0 does not
-%if "@gdb_version@" < "5.0"
+%if "%{gdb_version}" < "5.0"
 %doc %{_prefix}/info/readline.info*
 %endif
 
@@ -43,7 +42,7 @@ This is the base for gdb regardless of target CPU.
 # We use libiberty from gcc
 # %{_prefix}/lib/libiberty*
 
-%post -n rtems-base-gdb
+%post -n %{rpmprefix}rtems@osversion@-base-gdb
   if test -d $RPM_INSTALL_PREFIX/rtems/info;
   then
     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
@@ -53,7 +52,7 @@ This is the base for gdb regardless of target CPU.
     done
   fi
 
-%postun -n rtems-base-gdb
+%postun -n %{rpmprefix}rtems@osversion@-base-gdb
   if test -d $RPM_INSTALL_PREFIX/rtems/info;
   then
     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add
index b939352fff..316cd29b92 100644
--- a/scripts/gdb/gdb.add
+++ b/scripts/gdb/gdb.add
@@ -1,17 +1,21 @@
-Name:         @target_alias@-gdb-collection
+
+%define gdb_version	@gdb_version@
+%define gdb_target	@target_alias@
+
+Name:         %{rpmprefix}%{gdb_target}-gdb-collection
 Release:      @Release@
 License:      GPL/LGPL
-Group:        rtems
+Group:        %{rpmgroup}
 
 Autoreqprov:  on
 Packager:     corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 
-Version:      @gdb_version@
-Summary:      gdb for target @target_alias@
-Source0:      ftp://ftp.gnu.org/pub/gnu/gdb-@gdb_version@.tar.gz
-Patch0:	      gdb-@gdb_version@-rtems-base-@gdb_patch_version@.diff
-Patch1:	      gdb-@gdb_version@-rtems-cg-@gdb_patch_version@.diff
-Patch2:	      gdb-@gdb_version@-rtems-rdbg-@gdb_patch_version@.diff
+Version:      %{gdb_version}
+Summary:      gdb for target %{gdb_version}
+Source0:      ftp://ftp.gnu.org/pub/gnu/gdb-%{gdb_version}.tar.gz
+Patch0:	      gdb-%{gdb_version}-rtems-base-@gdb_patch_version@.diff
+Patch1:	      gdb-%{gdb_version}-rtems-cg-@gdb_patch_version@.diff
+Patch2:	      gdb-%{gdb_version}-rtems-rdbg-@gdb_patch_version@.diff
 
 %if "%{_vendor}" == "redhat"
 BuildPreReq:	ncurses-devel
@@ -34,10 +38,10 @@ NoSource:      0
 #  and targets which require extra arguments.
 %define _sim	1
 
-%if "@target_alias@" == "m68k-rtems"
+%if "%{gdb_target}" == "m68k-rtems@osversion@"
 %define _sim	0
 %endif
-%if "@target_alias@" == "i386-rtems"
+%if "%{gdb_target}" == "i386-rtems@osversion@"
 %define _sim	0
 %endif
 
@@ -45,13 +49,12 @@ NoSource:      0
 %description
 RTEMS is an open source operating system for embedded systems.
 
-This is the GNU gdb for RTEMS targetting @target_alias@.
+This is the GNU gdb for RTEMS targetting %{gdb_version}.
 
 %prep
-# untar the sources inside @target_alias@-gdb
-%setup -c -n @target_alias@-gdb -a 0
+%setup -c -n %{name}-%{version} -a 0
 
-cd gdb-@gdb_version@
+cd gdb-%{gdb_version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -61,7 +64,7 @@ cd gdb-@gdb_version@
  simargs="--enable-sim"
 %endif
 
-%if "@target_alias@" == "powerpc-rtems"
+%if "%{gdb_target}" == "powerpc-rtems@osversion@"
  simargs="$simargs --enable-sim-timebase --enable-sim-hardware"
  #  Enabling this causes the program image to be huge and causes
  #  some gcc/hosts combinations to run out of memory.
@@ -70,9 +73,10 @@ cd gdb-@gdb_version@
 
 test -d build || mkdir build
   cd build
-  ../gdb-@gdb_version@/configure \
+  export PATH="%{_bindir}:${PATH}"
+  ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
-    --target=@target_alias@ \
+    --target=%{gdb_target} \
     --verbose --prefix=%{_prefix} $simargs \
     --disable-nls
 
diff --git a/scripts/gdb/target-gdb.add b/scripts/gdb/target-gdb.add
index 76b3724634..eff9807ea0 100644
--- a/scripts/gdb/target-gdb.add
+++ b/scripts/gdb/target-gdb.add
@@ -1,31 +1,30 @@
 # =====================================================================
-# @target_alias@-gdb
+# %{gdb_target}-gdb
 # =====================================================================
 
-%package -n @target_alias@-gdb
-Provides:	@target_alias@-gdb
-Summary:      rtems gdb for @target_alias@
-Group: rtems
-Requires: rtems-base-gdb
+%package -n %{rpmprefix}%{gdb_target}-gdb
+Summary:      rtems gdb for %{gdb_target}
+Group: %{rpmgroup}
+Requires: %{rpmprefix}rtems@osversion@-base-gdb
 
-%description -n @target_alias@-gdb
+%description -n %{rpmprefix}%{gdb_target}-gdb
 
 RTEMS is an open source operating system for embedded systems.
 
-This is the GNU gdb for RTEMS targetting @target_alias@.
+This is the GNU gdb for RTEMS targetting %{gdb_target}.
 
-%files -n @target_alias@-gdb
-%defattr(-,attr,attr)
-%doc %{_prefix}/man/man1/@target_alias@-gdb.1*
+%files -n %{rpmprefix}%{gdb_target}-gdb
+%defattr(-,root,root)
+%doc %{_prefix}/man/man1/%{gdb_target}-gdb.1*
 %if "%_sim" == "1"
-%doc %{_prefix}/man/man1/@target_alias@-run.1*
+%doc %{_prefix}/man/man1/%{gdb_target}-run.1*
 %endif
 
 %dir %{_prefix}/bin
-%{_prefix}/bin/@target_alias@-gdb%{_exeext}
+%{_prefix}/bin/%{gdb_target}-gdb%{_exeext}
 %if "%_sim" == "1"
-%{_prefix}/bin/@target_alias@-run%{_exeext}
+%{_prefix}/bin/%{gdb_target}-run%{_exeext}
 %endif
-%if "@target_alias@" == "sparc-rtems"
-%{_prefix}/bin/@target_alias@-sis%{_exeext}
+%if "%{gdb_target}" == "sparc-rtems@osversion@"
+%{_prefix}/bin/%{gdb_target}-sis%{_exeext}
 %endif