diff --git a/readline-6.2-gdb.patch b/readline-6.2-gdb.patch new file mode 100644 index 0000000..3f46f94 --- /dev/null +++ b/readline-6.2-gdb.patch @@ -0,0 +1,24 @@ +diff -up ./complete.c.old ./complete.c +--- ./complete.c.old 2012-01-11 14:26:23.610354454 +0100 ++++ ./complete.c 2012-01-11 14:31:44.073348115 +0100 +@@ -485,7 +485,7 @@ get_y_or_n (for_pager) + driven functions. Have to wait until next major version to add new + state definition, since it will change value of RL_STATE_DONE. */ + #if defined (READLINE_CALLBACKS) +- if (RL_ISSTATE (RL_STATE_CALLBACK)) ++ if (RL_ISSTATE (RL_STATE_CALLBACK) && (! RL_ISSTATE (RL_STATE_FEDORA_GDB))) + return 1; + #endif + +diff -up ./readline.h.old ./readline.h +--- ./readline.h.old 2012-01-11 14:25:55.049711510 +0100 ++++ ./readline.h 2012-01-11 14:28:22.854863691 +0100 +@@ -840,6 +840,8 @@ extern int rl_inhibit_completion; + + #define RL_STATE_DONE 0x1000000 /* done; accepted line */ + ++#define RL_STATE_FEDORA_GDB 0x2000000 /* exception for fedora gdb */ ++ + #define RL_SETSTATE(x) (rl_readline_state |= (x)) + #define RL_UNSETSTATE(x) (rl_readline_state &= ~(x)) + #define RL_ISSTATE(x) (rl_readline_state & (x)) diff --git a/readline.spec b/readline.spec index aea99b2..a5bceb0 100644 --- a/readline.spec +++ b/readline.spec @@ -1,7 +1,7 @@ Summary: A library for editing typed command lines Name: readline Version: 6.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: System Environment/Libraries URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html @@ -14,6 +14,9 @@ Patch20: readline-6.2-shlib.patch Patch21: readline-6.1-audit.patch # isxdigit should not be defined as macro Patch22: readline-6.2-cppmacro.patch +# add workaround for problem in gdb +# in new version of readline needs to be deleted +Patch23: readline-6.2-gdb.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info BuildRequires: ncurses-devel @@ -56,6 +59,7 @@ library. %patch20 -p1 -b .shlib %patch21 -p1 -b .audit %patch22 -p1 -b .cppmacro +%patch23 -p1 -b .gdb pushd examples rm -f rlfe/configure @@ -133,6 +137,9 @@ fi %{_libdir}/lib*.a %changelog +* Wed Jan 11 2012 Lukas Nykryn 6.2-4 +- temporary fix for problem with gdb, wait for y/n (#701131) + * Wed Aug 31 2011 Lukas Nykryn 6.2-3 - isxdigit is no longer defined as macro ic c++ (#723299)