Rework --with-system-readline handling.

contrib/crossrpms/gdb/build.add

@@ -16,9 +16,7 @@
     --disable-win32-registry \
     --disable-werror \
     %{build_sim} \
-%if "%{gdb_version}" >= "6.7"
+    %{?with_system_readline:--with-system-readline} \
-    --with-system-readline \
-%endif
 %if "%{gdb_version}" >= "6.6"
     --with-expat \
 %endif

contrib/crossrpms/gdb/gdb.add

@@ -55,8 +55,15 @@ BuildRequires: %{_host_rpmprefix}expat-devel
 %if "%{_build}" != "%{_host}"
 BuildRequires:  %{_host_rpmprefix}termcap-devel
 %endif
+%bcond_with system_readline
 %endif
-BuildRequires:  %{_host_rpmprefix}readline-devel
+
+%if 0%{?fedora} >= 12
+%bcond_with system_readline
+%else
+%bcond_without system_readline
+%endif
+%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel}
 BuildRequires:  %{_host_rpmprefix}ncurses-devel
 
 %if "%{gdb_version}" >= "6.8.50"

contrib/crossrpms/gdb/prep.add

@@ -6,7 +6,5 @@ cd gdb-%{gdb_version}
 %{?PATCH0:%patch0 -p1}
 cd ..
 
-%if "%{gdb_version}" >= "6.7"
 # Force using a system-provided libreadline
-rm -f gdb-%{gdb_version}/readline/configure
+%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure}
-%endif