From 9bb08afeff72218aba650e373152c8c27f4f3aa5 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 29 Apr 2008 11:40:37 +0000
Subject: Improvements for gdb-6.6/6.7

---
 contrib/crossrpms/gdb/gdb.add  | 5 +----
 contrib/crossrpms/gdb/prep.add | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'contrib')

diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add
index 2096382af2..140603b16e 100644
--- a/contrib/crossrpms/gdb/gdb.add
+++ b/contrib/crossrpms/gdb/gdb.add
@@ -26,7 +26,7 @@ BuildRequires: %{_host_rpmprefix}expat-devel
 %endif
 %endif
 
-%if "%{gdb_version}" < "6.6"
+%if "%{gdb_version}" < "6.7"
 %if "%{_build}" != "%{_host}"
 BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
@@ -39,9 +39,6 @@ BuildRequires:  %{_host_rpmprefix}ncurses-devel
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
 %endif
-%if "@tool_target@" == "sparc-rtems@rtems_api@"
-BuildConflicts:	libtermcap-devel termcap-devel
-%endif
 
 %if %build_infos
 
diff --git a/contrib/crossrpms/gdb/prep.add b/contrib/crossrpms/gdb/prep.add
index e5e689f268..dedd1d2cbf 100644
--- a/contrib/crossrpms/gdb/prep.add
+++ b/contrib/crossrpms/gdb/prep.add
@@ -4,10 +4,9 @@
 %setup -q -D -T -n %{name}-%{version} -a0
 cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
-%{?PATCH1:%patch1 -p1}
 cd ..
 
-%if "%{gdb_version}" >= "6.8"
+%if "%{gdb_version}" >= "6.7"
 # Force using a system-provided libreadline
 rm -f gdb-%{gdb_version}/readline/configure
 %endif
-- 
cgit v1.2.3