Author: eandry
Date: Thu Feb  1 21:11:25 2007
New Revision: 115840

Added:
   packages/cooker/readline/current/SOURCES/readline-5.2.tar.bz2   (contents, 
props changed)
   packages/cooker/readline/current/SOURCES/readline52-001
Removed:
   packages/cooker/readline/current/SOURCES/readline-5.1.tar.bz2
   packages/cooker/readline/current/SOURCES/readline-wrap.patch
   packages/cooker/readline/current/SOURCES/readline51-001
Modified:
   packages/cooker/readline/current/SPECS/readline.spec

Log:
New version 5.2
- drop patches 11 and 18
- add upstream patch (P12)

Added: packages/cooker/readline/current/SOURCES/readline-5.2.tar.bz2
==============================================================================
Binary file. No diff available.

Added: packages/cooker/readline/current/SOURCES/readline52-001
==============================================================================
--- (empty file)
+++ packages/cooker/readline/current/SOURCES/readline52-001     Thu Feb  1 
21:11:25 2007
@@ -0,0 +1,30 @@
+                          READLINE PATCH REPORT
+                          =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-001
+
+Bug-Reported-by:       [EMAIL PROTECTED]
+Bug-Reference-ID:      <[EMAIL PROTECTED]>
+Bug-Reference-URL:     
http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html
+                       
http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html
+
+Bug-Description:
+
+In some cases, code that is intended to be used in the presence of multibyte
+characters is called when no such characters are present, leading to incorrect
+display position calculations and incorrect redisplay.
+
+Patch:
+
+*** ../readline-5.2/display.c  Thu Sep 14 14:20:12 2006
+--- display.c  Mon Nov 13 17:55:57 2006
+***************
+*** 2381,2384 ****
+--- 2409,2414 ----
+    if (end <= start)
+      return 0;
++   if (MB_CUR_MAX == 1 || rl_byte_oriented)
++     return (end - start);
+  
+    memset (&ps, 0, sizeof (mbstate_t));

Modified: packages/cooker/readline/current/SPECS/readline.spec
==============================================================================
--- packages/cooker/readline/current/SPECS/readline.spec        (original)
+++ packages/cooker/readline/current/SPECS/readline.spec        Thu Feb  1 
21:11:25 2007
@@ -1,7 +1,7 @@
 ## Do not apply library policy!!
 %define        name    readline
-%define        version 5.1
-%define        release %mkrel 3
+%define        version 5.2
+%define        release %mkrel 1
 
 %define lib_major      5
 %define lib_name_orig  lib%{name}
@@ -15,14 +15,12 @@
 Group:         System/Libraries
 Url:           http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 Source0:       ftp://ftp.gnu.org/pub/gnu/readline/%{name}-%{version}.tar.bz2
-#Patch1:       
http://kldp.org/~mindgame/unix/hangul/readline/readline-4.1-i18n.patch.bz2
 Patch3:                readline-4.1-outdated.patch
 Patch5:                readline-4.1-resize.patch
-#Patch100:     readline-4.3-vim-reapeat-fix.diff.bz2
-#Patch101:     readline-4.3-segfault-fix.diff.bz2
-Patch11:       ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/readline51-001
+#Patch11:      ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/readline51-001
+Patch12:       readline52-001
 Patch16:       readline-4.3-no_rpath.patch
-Patch18:       readline-wrap.patch
+#Patch18:      readline-wrap.patch
  
 Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -59,15 +57,12 @@
 
 %prep
 %setup -q
-#%patch1 -p1 -b .i18n
 %patch3 -p1 -b .outdated
 %patch5 -p1 -b .resize
-#%patch100 -p1 -b .vim
-#%patch101 -p1 -b .sig11
 libtoolize --copy --force
-%patch11 -p0 -b .001
+%patch12 -p0 -b .001
 %patch16 -p1 -b .no_rpath
-%patch18 -p1 -b .wrap
+#%patch18 -p1 -b .wrap
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"

Reply via email to