Regenerate.

10 files changed, 158 insertions, 375 deletions

diff --git a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
index 8a42c3cbd1..477a4636a7 100644
--- a/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/arm/rtems-4.8-arm-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-arm-rtems4.8-gdb
 Summary:	Gdb for target arm-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "arm-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gdb.spec
index f21ce2a780..def9abd2fb 100644
--- a/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/avr/rtems-4.8-avr-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-avr-rtems4.8-gdb
 Summary:	Gdb for target avr-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "avr-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libavr-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec
index 0964b76fe8..8d1fb60073 100644
--- a/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/bfin/rtems-4.8-bfin-rtems4.8-gdb.spec
@@ -26,9 +26,15 @@ URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "bfin-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
@@ -68,6 +75,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -80,25 +91,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -111,10 +104,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libbfin-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -187,9 +178,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -197,9 +185,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -211,10 +196,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
index 9657f53f60..e117580d56 100644
--- a/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/h8300/rtems-4.8-h8300-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-h8300-rtems4.8-gdb
 Summary:	Gdb for target h8300-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "h8300-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libh8300-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
index b71e1f79f8..cb238ab01c 100644
--- a/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/i386/rtems-4.8-i386-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-i386-rtems4.8-gdb
 Summary:	Gdb for target i386-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "i386-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libi386-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
index 43dd0381b4..30a6c2707d 100644
--- a/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-m68k-rtems4.8-gdb
 Summary:	Gdb for target m68k-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "m68k-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm68k-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
index 0780dfb000..3239fd1714 100644
--- a/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/mips/rtems-4.8-mips-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-mips-rtems4.8-gdb
 Summary:	Gdb for target mips-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "mips-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmips-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
index b65f2210b8..a2e6d3d70f 100644
--- a/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/mipstx39/rtems-4.8-mipstx39-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-mipstx39-rtems4.8-gdb
 Summary:	Gdb for target mipstx39-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "mipstx39-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmipstx39-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
index b290d49879..e5c1730dd9 100644
--- a/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/powerpc/rtems-4.8-powerpc-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-powerpc-rtems4.8-gdb
 Summary:	Gdb for target powerpc-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "powerpc-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpowerpc-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*
diff --git a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
index 1d15e71157..8f6e4f4176 100644
--- a/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
+++ b/contrib/crossrpms/rtems4.8/sh/rtems-4.8-sh-rtems4.8-gdb.spec
@@ -20,15 +20,21 @@ Name:		rtems-4.8-sh-rtems4.8-gdb
 Summary:	Gdb for target sh-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	9%{?dist}
+Release:	10%{?dist}
 License:	GPL/LGPL
 URL: 		http://sources.redhat.com/gdb
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{gdb_version}" >= "6.6"
+# suse
 %if "%{?suse}"
-BuildRequires:	expat
-%else 
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
+%else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -36,19 +42,17 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "sh-rtems4.8" == "sparc-rtems4.8"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.8-gdb-common
 
 Source0:	ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2
 %{?_without_sources:NoSource:	0}
-%if "%{gdb_version}" == "6.5"
-Patch0:		gdb-6.5-rtems-20060713.diff
-%endif
 %if "%{gdb_version}" == "6.6"
-Patch0:		gdb-6.6-rtems4.8-20070306.diff
+Patch0:		gdb-6.6-rtems4.8-20071110.diff
 %endif
 
 %description
@@ -73,6 +77,10 @@ cd ..
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -85,25 +93,7 @@ cd ..
   rm -rf $RPM_BUILD_ROOT
 
   cd build
-%if "%{gdb_version}" >= "6.3"
   make DESTDIR=$RPM_BUILD_ROOT install
-%else
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install
-
-  make prefix=$RPM_BUILD_ROOT%{_prefix} \
-    bindir=$RPM_BUILD_ROOT%{_bindir} \
-    includedir=$RPM_BUILD_ROOT%{_includedir} \
-    libdir=$RPM_BUILD_ROOT%{_libdir} \
-    infodir=$RPM_BUILD_ROOT%{_infodir} \
-    mandir=$RPM_BUILD_ROOT%{_mandir} \
-    install-info
-%endif
 
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
   touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -116,10 +106,8 @@ cd ..
 # We don't ship host files
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-%if "%{gdb_version}" >= "6.4"
 # host library, installed to a bogus directory
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsh-rtems4.8-sim.a
-%endif
 
   cd ..
 
@@ -192,9 +180,6 @@ GDB files shared by all targets.
 
 %post -n rtems-4.8-gdb-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -202,9 +187,6 @@ GDB files shared by all targets.
 %preun -n rtems-4.8-gdb-common
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || :
-%if "%{gdb_version}" < "6.3"
-  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz || :
-%endif
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || :
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || :
@@ -216,10 +198,6 @@ fi
 %ghost %{_infodir}/dir
 %{_infodir}/gdb.info*
 
-# FIXME: When had mmalloc.info been removed?
-%if "%{gdb_version}" < "6.3"
-%{_infodir}/mmalloc.info*
-%endif
 %{_infodir}/gdbint.info*
 %{_infodir}/stabs.info*
 %{_infodir}/annotate.info*