Sync with trunk

contrib/crossrpms/gdb/base-gdb.add

@@ -14,9 +14,6 @@ GDB files shared by all targets.
 
 %post -n @rpmprefix@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 || :
@@ -24,9 +21,6 @@ GDB files shared by all targets.
 %preun -n @rpmprefix@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 || :
@@ -38,10 +32,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*

contrib/crossrpms/gdb/build.add

@@ -10,6 +10,10 @@
     --disable-win32-registry \
     --disable-werror \
     --enable-sim \
+%if "%{gdb_version}" >= "6.6"
+    --with-system-readline \
+    --with-expat \
+%endif
     --with-sysroot=%{_prefix}/@tool_target@/sys-root \
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \

contrib/crossrpms/gdb/gdb.add

@@ -11,9 +11,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
+%if "%{?suse}" >= "10.3"
+BuildRequires: libexpat-devel
 %else
+BuildRequires: expat
+%endif
+%else
+# fedora/redhat 
 BuildRequires:	expat-devel
 %endif
 %endif
@@ -22,9 +28,10 @@ BuildRequires:	expat-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %endif
-%if "@tool_target@" == "sparc-rtems4.8"
+%if "@tool_target@" == "sparc-rtems4.9"
-BuildRequires:	libtermcap-devel
+BuildConflicts:	libtermcap-devel termcap-devel
 %endif
+BuildRequires:  readline-devel
 BuildRequires:	ncurses-devel
 %if %build_infos
 

contrib/crossrpms/gdb/install.add

@@ -2,27 +2,7 @@
   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
-
-%if %build_infos
-  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
-%endif
 
 %if %build_infos
   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -40,10 +20,8 @@
 # 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}/lib@tool_target@-sim.a
-%endif
 
   cd ..