gdb-6.7.1-4

21 files changed, 224 insertions, 73 deletions

diff --git a/contrib/crossrpms/rtems4.9/arm/Makefile.am b/contrib/crossrpms/rtems4.9/arm/Makefile.am
index b5e84eb642..e0f3057d35 100644
--- a/contrib/crossrpms/rtems4.9/arm/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/arm/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
index 7a7367f0cb..0acbdff6b8 100644
--- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-arm-rtems4.9-gdb
 Summary:	Gdb for target arm-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "arm-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target arm-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/avr/Makefile.am b/contrib/crossrpms/rtems4.9/avr/Makefile.am
index bec2b6bcc1..b736ebad98 100644
--- a/contrib/crossrpms/rtems4.9/avr/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/avr/Makefile.am
@@ -18,7 +18,7 @@ include ../gcc.am
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
index 9a973d4011..a5445c0d77 100644
--- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-avr-rtems4.9-gdb
 Summary:	Gdb for target avr-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "avr-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target avr-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
index 406877eecf..62fe2f9cf9 100644
--- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-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.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-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}
diff --git a/contrib/crossrpms/rtems4.9/h8300/Makefile.am b/contrib/crossrpms/rtems4.9/h8300/Makefile.am
index f29a8a4b83..39e98cc56b 100644
--- a/contrib/crossrpms/rtems4.9/h8300/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/h8300/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
index 6438158861..b0b653f374 100644
--- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-h8300-rtems4.9-gdb
 Summary:	Gdb for target h8300-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "h8300-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target h8300-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/i386/Makefile.am b/contrib/crossrpms/rtems4.9/i386/Makefile.am
index addd415f5f..95a7a2d5bc 100644
--- a/contrib/crossrpms/rtems4.9/i386/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/i386/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
index 0ebb13b3d2..f86bc316bc 100644
--- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-i386-rtems4.9-gdb
 Summary:	Gdb for target i386-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "i386-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target i386-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/m68k/Makefile.am b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
index ab0b302dcb..2631c2122c 100644
--- a/contrib/crossrpms/rtems4.9/m68k/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/m68k/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
index 4b04d8f70c..6e6e444865 100644
--- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-m68k-rtems4.9-gdb
 Summary:	Gdb for target m68k-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "m68k-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target m68k-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/mips/Makefile.am b/contrib/crossrpms/rtems4.9/mips/Makefile.am
index 7674d7b850..1bad083abd 100644
--- a/contrib/crossrpms/rtems4.9/mips/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/mips/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
index 278aef68cd..c6dffba929 100644
--- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-mips-rtems4.9-gdb
 Summary:	Gdb for target mips-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "mips-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target mips-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
index ec586722ee..9f7263b950 100644
--- a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am
@@ -7,6 +7,6 @@ include $(top_srcdir)/mkspec.am
 # We only want a gdb with a tx39 simulator in it.  We share the other tools
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
diff --git a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
index 57ff5fa669..fda92432cf 100644
--- a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-mipstx39-rtems4.9-gdb
 Summary:	Gdb for target mipstx39-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "mipstx39-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target mipstx39-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am b/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
index bfcb0de6b8..87457933d2 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/powerpc/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
index df9e278c6a..166467cc5d 100644
--- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-powerpc-rtems4.9-gdb
 Summary:	Gdb for target powerpc-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "powerpc-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target powerpc-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/sh/Makefile.am b/contrib/crossrpms/rtems4.9/sh/Makefile.am
index 12d750f266..69b0c8cb69 100644
--- a/contrib/crossrpms/rtems4.9/sh/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/sh/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
index 5deda3f4e5..f8e4d9f441 100644
--- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-sh-rtems4.9-gdb
 Summary:	Gdb for target sh-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "sh-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target sh-rtems4.9
@@ -76,6 +86,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}
diff --git a/contrib/crossrpms/rtems4.9/sparc/Makefile.am b/contrib/crossrpms/rtems4.9/sparc/Makefile.am
index 47b4d1ca6c..868c5e64ed 100644
--- a/contrib/crossrpms/rtems4.9/sparc/Makefile.am
+++ b/contrib/crossrpms/rtems4.9/sparc/Makefile.am
@@ -19,7 +19,7 @@ GCC_OPTS += --languages=cxx
 
 GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 3%{?dist}
+GDB_RPMREL = 4%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 
diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
index e0373378e1..d2c6ca93fc 100644
--- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
+++ b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec
@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.7
-%define gdb_rpmvers %{expand:%(echo 6.7 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.9-sparc-rtems4.9-gdb
 Summary:	Gdb for target sparc-rtems4.9
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	4%{?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,8 +42,9 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %if "sparc-rtems4.9" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 
 Requires:	rtems-4.9-gdb-common
@@ -53,6 +60,9 @@ Patch0:		gdb-6.6-rtems4.8-20070306.diff
 %if "%{gdb_version}" == "6.7"
 Patch0:		gdb-6.7-rtems4.9-20071011.diff
 %endif
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.9-20071031.diff
+%endif
 
 %description
 GDB for target sparc-rtems4.9
@@ -76,6 +86,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}