[readline] fix for 723299: isxdigit is no longer defined as macro ic c++

[Lukáš Nykrýn]

commit 80247e28e5d885e6fd8ff74be7086535548214d8
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Wed Aug 31 09:49:08 2011 +0200

    fix for 723299: isxdigit is no longer defined as macro ic c++

 readline-6.2-cppmacro.patch |   12 ++++++++++++
 readline.spec               |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/readline-6.2-cppmacro.patch b/readline-6.2-cppmacro.patch
new file mode 100644
index 0000000..c7eec33
--- /dev/null
+++ b/readline-6.2-cppmacro.patch
@@ -0,0 +1,12 @@
+diff -up readline-6.2/chardefs.h.orig readline-6.2/chardefs.h
+--- readline-6.2/chardefs.h.orig	2011-08-31 09:24:01.852751855 +0200
++++ readline-6.2/chardefs.h	2011-08-31 09:24:07.143685706 +0200
+@@ -72,7 +72,7 @@
+ #  define IN_CTYPE_DOMAIN(c) isascii(c)
+ #endif
+ 
+-#if !defined (isxdigit) && !defined (HAVE_ISXDIGIT)
++#if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus) 
+ #  define isxdigit(c)   (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
+ #endif
+ 
diff --git a/readline.spec b/readline.spec
index 6984d4e..aea99b2 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: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
@@ -12,6 +12,8 @@ Patch1: ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001
 Patch20: readline-6.2-shlib.patch
 # add TTY input audit support
 Patch21: readline-6.1-audit.patch
+# isxdigit should not be defined as macro
+Patch22:  readline-6.2-cppmacro.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: ncurses-devel
@@ -53,6 +55,7 @@ library.
 %patch1 -p0
 %patch20 -p1 -b .shlib
 %patch21 -p1 -b .audit
+%patch22 -p1 -b .cppmacro
 
 pushd examples
 rm -f rlfe/configure
@@ -130,6 +133,9 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Wed Aug 31 2011 Lukas Nykryn <lnykryn at redhat.com> 6.2-3
+- isxdigit is no longer defined as macro ic c++ (#723299)
+
 * Tue Mar 01 2011 Miroslav Lichvar <mlichvar at redhat.com> 6.2-2
 - include patch 001