Upgrade to gdb-4.7.1

contrib/crossrpms/rtems4.8/sparc/Makefile.am

@@ -17,9 +17,9 @@ NEWLIB_VERS = 1.15.0
 include ../gcc.am
 GCC_OPTS += --languages=cxx
 
-GDB_VERS = 6.5
+GDB_VERS = 6.7.1
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2%{?dist}
+GDB_RPMREL = 1%{?dist}
 include ../gdb.am
 GDB_OPTS +=
 

contrib/crossrpms/rtems4.8/sparc/gdb-sources.add

@@ -1,8 +1,5 @@
 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
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.8-20071031.diff
 %endif

contrib/crossrpms/rtems4.8/sparc/rtems-4.8-sparc-rtems4.8-gdb.spec

@@ -13,22 +13,28 @@
 %define _exeext %{nil}
 %endif
 
-%define gdb_version 6.5
-%define gdb_rpmvers %{expand:%(echo 6.5 | tr - _)} 
+%define gdb_version 6.7.1
+%define gdb_rpmvers %{expand:%(echo 6.7.1 | tr - _)} 
 
 Name:		rtems-4.8-sparc-rtems4.8-gdb
 Summary:	Gdb for target sparc-rtems4.8
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	2%{?dist}
+Release:	1%{?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 "sparc-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
+%if "%{gdb_version}" == "6.7.1"
+Patch0:		gdb-6.7.1-rtems4.8-20071031.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}/libsparc-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*