rpms/eblook/F-11 eblook-strcpy.patch, NONE, 1.1 import.log, NONE, 1.1 eblook.spec, 1.4, 1.5

[Daiki Ueno]

Author: ueno

Update of /cvs/pkgs/rpms/eblook/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18618/F-11

Modified Files:
	eblook.spec 
Added Files:
	eblook-strcpy.patch import.log 
Log Message:
- don't use tabs in this spec.
- change the encoding of Japanese docs to UTF-8.
- fix wrong usage of strcpy (closes #579610).


eblook-strcpy.patch:
 eblook.c  |    4 ++--
 eblook.c~ |only
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eblook-strcpy.patch ---
diff -ru 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-04-06 11:59:31.234479094 +0900
@@ -765,7 +765,7 @@
 	argv[num++] = p;
 	reserved = 1;
       }
-      strcpy (p, p + 1);
+      memmove (p, p + 1, strlen (p));
       p--;
       in_quote = !in_quote;
       break;
@@ -779,7 +779,7 @@
       break;
 
     case '\\':
-      strcpy (p, p + 1);
+      memmove (p, p + 1, strlen (p));
     default:
       if (!reserved) {
 	argv[num++] = p;
Only in eblook-1.6.1: eblook.c~


--- NEW FILE import.log ---
eblook-1_6_1-8_fc13:F-11:eblook-1.6.1-8.fc13.src.rpm:1271403341


Index: eblook.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eblook/F-11/eblook.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eblook.spec	24 Feb 2009 13:25:23 -0000	1.4
+++ eblook.spec	16 Apr 2010 07:36:38 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           eblook
 Version:        1.6.1
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        Command-line EB and EPWING dictionary search program
 
 Group:          Applications/Text
 License:        GPLv2+
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  eb-devel
@@ -17,6 +18,11 @@ Command-line EB and EPWING dictionary se
 
 %prep
 %setup -q
+%patch0 -p1
+for i in NEWS README; do
+    iconv -f ISO-2022-JP -t UTF-8 $i > ${i}.UTF-8
+    mv ${i}.UTF-8 $i
+done
 
 
 %build
@@ -60,6 +66,19 @@ fi
 
 
 %changelog
+* Fri Apr 16 2010 Daiki Ueno <dueno at redhat.com> - 1.6.1-8
+- don't use tabs in this spec.
+- change the encoding of Japanese docs to UTF-8.
+
+* Fri Apr 16 2010 Daiki Ueno <dueno at redhat.com> - 1.6.1-7
+- fix wrong usage of strcpy (closes #579610).
+
+* Mon Aug 31 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.1-6
+- F-12: Rebuild against new eb
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild