[eblook/f13/master] Update to 1.6.1-10.

[Daiki Ueno]

commit 80577d730c990bee2c92e983cc535a82870c6f33
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Wed Aug 18 11:03:57 2010 +0900

    Update to 1.6.1-10.

 eblook-ssize_t.patch |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 eblook.spec          |    7 +++++-
 2 files changed, 66 insertions(+), 1 deletions(-)
---
diff --git a/eblook-ssize_t.patch b/eblook-ssize_t.patch
new file mode 100644
index 0000000..b9384a6
--- /dev/null
+++ b/eblook-ssize_t.patch
@@ -0,0 +1,60 @@
+Description: Fix incompatible pointer type for eb_read_* functions
+Author: Kazuhiro Ito <kzhr at d1.dion.ne.jp>, Tatsuya Kinoshita <tats at debian.org>
+
+diff -urN eblook-1.6.1.orig/eblook.c eblook-1.6.1/eblook.c
+--- eblook-1.6.1.orig/eblook.c	2004-06-18 01:09:01.000000000 +0900
++++ eblook-1.6.1/eblook.c	2010-08-18 00:02:36.000000000 +0900
+@@ -1166,7 +1166,7 @@
+ {
+     static unsigned char buffer[MAX_BITMAP_SIZE];
+     EB_Position pos;
+-    int len;
++    ssize_t len;
+     int ret;
+     int i;
+     int j;
+@@ -1241,7 +1241,7 @@
+ {
+     static unsigned char buffer[MAX_BITMAP_SIZE];
+     EB_Position pos;
+-    int len;
++    ssize_t len;
+     int ret;
+     int i;
+     int j;
+@@ -3097,7 +3097,7 @@
+ {
+     EB_Error_Code error_code;
+     char buf[2048];
+-    int buflen;
++    ssize_t buflen;
+ 
+ #if MULTI_DEBUG
+     xprintf(">> seeking %d:%d\n", can->child_pos.page, can->child_pos.offset);
+@@ -3109,7 +3109,7 @@
+     error_code = eb_read_text(book, 0, &multi_candidate_hookset, NULL, 2047, buf, &buflen);
+ #if MULTI_DEBUG
+     xprintf(">> eb_read_text %s\n", eb_error_message(error_code));
+-    xprintf(">> buflen = %d\n", buflen);
++    xprintf(">> buflen = %ld\n", (long)buflen);
+     xprintf(">> ]\n");
+ #endif
+ 
+@@ -3168,7 +3168,7 @@
+     EB_Position pos0;
+ {
+     char buf[2048];
+-    int buflen;
++    ssize_t buflen;
+     struct multi_can *child, *ptail;
+     EB_Error_Code error_code = EB_SUCCESS;
+ 
+@@ -3191,7 +3191,7 @@
+ 	return 0;
+     }
+ #if MULTI_DEBUG
+-    xprintf(">> buflen = %d\n", buflen);
++    xprintf(">> buflen = %ld\n", (long)buflen);
+ #endif
+ 
+     tail->terminated = 1;
diff --git a/eblook.spec b/eblook.spec
index 3b986d8..d3e938e 100644
--- a/eblook.spec
+++ b/eblook.spec
@@ -1,6 +1,6 @@
 Name:           eblook
 Version:        1.6.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Command-line EB and EPWING dictionary search program
 
 Group:          Applications/Text
@@ -9,6 +9,7 @@ URL:            http://openlab.ring.gr.jp/edict/eblook/
 Source0:        http://openlab.ring.gr.jp/edict/eblook/dist/%{name}-%{version}.tar.gz
 Patch0:         eblook-strcpy.patch
 Patch1:         eblook-size_t.patch
+Patch2:         eblook-ssize_t.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  eb-devel
@@ -21,6 +22,7 @@ Command-line EB and EPWING dictionary search program.
 %setup -q
 %patch0 -p1
 %patch1 -p2
+%patch2 -p1
 for i in NEWS README; do
     iconv -f ISO-2022-JP -t UTF-8 $i > ${i}.UTF-8
     mv ${i}.UTF-8 $i
@@ -68,6 +70,9 @@ fi
 
 
 %changelog
+* Wed Aug 18 2010 Daiki Ueno <dueno at redhat.com> - 1.6.1-10
+- apply a patch for ssize_t and int confusion, provided by Tatsuya Kinoshita.
+
 * Tue Aug 17 2010 Daiki Ueno <dueno at redhat.com> - 1.6.1-9
 - apply a patch for size_t and int confusion, provided by Kazuhiro Ito.