cra pushed to perl-Term-ReadLine-Gnu (epel7). "Revert removal of rl_executing_key and rl_executing_keyseq"

[notifications at fedoraproject.org]

From c0ba6bd56ee8d8b627187a6d6e220e4eeefbbce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
Date: Tue, 22 Jul 2014 16:09:35 +0200
Subject: Revert removal of rl_executing_key and rl_executing_keyseq


diff --git a/Term-ReadLine-Gnu-1.24-define_rl_executing_key.patch b/Term-ReadLine-Gnu-1.24-define_rl_executing_key.patch
deleted file mode 100644
index 884fe9a..0000000
--- a/Term-ReadLine-Gnu-1.24-define_rl_executing_key.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Provide dummy rl_executing_key and rl_executing_keyseq
-
-Fedora removed the two symbols and their code from readline-6.3 which
-Term-ReadLine-Gnu-1.24 expects as they exist in upstream readline-6.3.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1112614
-https://bugzilla.redhat.com/show_bug.cgi?id=1120050
-
-Index: Gnu.xs
-===================================================================
---- Gnu.xs	(revision 473)
-+++ Gnu.xs	(working copy)
-@@ -326,8 +326,6 @@
- /* features introduced by GNU Readline 6.3 */
- static rl_hook_func_t *rl_signal_event_hook = NULL;
- static rl_hook_func_t *rl_input_available_hook = NULL;
--static int rl_executing_key = 0;
--static char *rl_executing_keyseq = NULL;
- static int rl_change_environment = 1;
- static rl_icppfunc_t *rl_filename_stat_hook = NULL;
- 
-@@ -340,6 +338,10 @@
-  */
- #endif /* (RL_READLINE_VERSION < 0x0603) */
- 
-+/* features introduced by GNU Readline 6.3 to be defined by an application */
-+int rl_executing_key = 0;
-+char *rl_executing_keyseq = NULL;
-+
- /*
-  * utility/dummy functions
-  */                                                                                
-Index: t/readline.t
-===================================================================
---- t/readline.t	(revision 473)
-+++ t/readline.t	(working copy)
-@@ -166,7 +166,7 @@
- if ($version < 0x0603) {
-     $res = ! defined($a->{executing_keyseq});	ok('executing_keyseq');
- } else {
--    $res = defined($a->{executing_keyseq});	ok('executing_keyseq');
-+    $res = ! defined($a->{executing_keyseq});	ok('executing_keyseq disabled');
- }
- $res = $a->{key_sequence_length} == 0;		ok('key_sequence_length');
- 
diff --git a/perl-Term-ReadLine-Gnu.spec b/perl-Term-ReadLine-Gnu.spec
index 75aab5e..cc5ce3e 100644
--- a/perl-Term-ReadLine-Gnu.spec
+++ b/perl-Term-ReadLine-Gnu.spec
@@ -1,12 +1,10 @@
 Name:           perl-Term-ReadLine-Gnu
 Version:        1.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl extension for the GNU Readline/History Library
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Term-ReadLine-Gnu/
 Source0:        http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-%{version}.tar.gz
-# Cope with removed rl_executing_key and rl_executing_keyseq, bug #1112614
-Patch0:         Term-ReadLine-Gnu-1.24-define_rl_executing_key.patch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel >= 2.1
@@ -22,7 +20,6 @@ An implementation of Term::ReadLine using the GNU Readline/History Library.
 
 %prep
 %setup -q -n Term-ReadLine-Gnu-%{version}
-%patch0 -p0
 
 
 %build
@@ -62,6 +59,10 @@ expect -c '
 
 
 %changelog
+* Tue Jul 22 2014 Petr Pisar <ppisar at redhat.com> - 1.24-4
+- Revert removal of rl_executing_key and rl_executing_keyseq because readline
+  library have been fixed (bugs #1112614)
+
 * Wed Jul 16 2014 Petr Pisar <ppisar at redhat.com> - 1.24-3
 - Cope with removed rl_executing_key and rl_executing_keyseq (bug #1112614)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-Term-ReadLine-Gnu.git/commit/?h=epel7&id=c0ba6bd56ee8d8b627187a6d6e220e4eeefbbce4