rpms/centericq/devel centericq-kkstrtext.patch, NONE, 1.1 centericq-kkconsui.patch, 1.1, 1.2 centericq.spec, 1.12, 1.13

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27428

Modified Files:
	centericq-kkconsui.patch centericq.spec 
Added Files:
	centericq-kkstrtext.patch 
Log Message:
- more/changed x86_64 build fixes


centericq-kkstrtext.patch:

--- NEW FILE centericq-kkstrtext.patch ---
--- kkstrtext-0.1/kkstrtext.cc.orig	2005-05-26 22:25:46.000000000 +0200
+++ kkstrtext-0.1/kkstrtext.cc	2005-05-26 22:28:11.000000000 +0200
@@ -885,7 +885,7 @@
 #ifdef HAVE_ICONV
     iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());
 
-    if(((int) cd) != -1) {
+    if(((size_t) cd) != -1) {
 	string r, text(atext);
 	size_t inleft, outleft, soutleft;
 	char *inbuf, *outbuf, *sinbuf, *soutbuf;

centericq-kkconsui.patch:

Index: centericq-kkconsui.patch
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq-kkconsui.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- centericq-kkconsui.patch	25 May 2005 23:35:53 -0000	1.1
+++ centericq-kkconsui.patch	26 May 2005 20:47:07 -0000	1.2
@@ -1,16 +1,16 @@
---- kkconsui-0.1/src/texteditor.cc.orig	2005-05-26 01:27:45.000000000 +0200
-+++ kkconsui-0.1/src/texteditor.cc	2005-05-26 01:28:10.000000000 +0200
+--- kkconsui-0.1/src/texteditor.cc.orig	2003-09-09 23:51:33.000000000 +0200
++++ kkconsui-0.1/src/texteditor.cc	2005-05-26 22:30:27.000000000 +0200
 @@ -1940,11 +1940,11 @@
  }
  
  int texteditor::findint(void *p1, void *p2) {
 -    return *(int *) p1 != (int) p2;
-+    return *(long *) p1 != (long) p2;
++    return *(size_t *) p1 != (size_t) p2;
  }
  
  int texteditor::findhighline(void *p1, void *p2) {
 -    return *(int *) p1 != ((highline *) p2)->line;
-+    return *(long *) p1 != ((highline *) p2)->line;
++    return *(size_t *) p1 != ((highline *) p2)->line;
  }
  
  void texteditor::shiftmarkedblock(int delta) {


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- centericq.spec	25 May 2005 23:35:53 -0000	1.12
+++ centericq.spec	26 May 2005 20:47:07 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.20.0
-Release:        5
+Release:        6
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -10,6 +10,7 @@
 Source0:        http://konst.org.ua/download/centericq-4.20.0.tar.bz2
 Patch0:         centericq-libyahoo.patch
 Patch1:         centericq-kkconsui.patch
+Patch2:         centericq-kkstrtext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -26,10 +27,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0
-
-%ifarch x86_64
 %patch1
-%endif
+%patch2
 
 %build
 CFLAGS="-I/usr/include/openssl -I/usr/kerberos/include -I/usr/include ${RPM_OPT_FLAGS}" \
@@ -60,6 +59,11 @@
 
 %changelog
 * Thu May 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.20.0-6
+- renew -5 buildfix and drop ifarch
+- add another x86_64 buildfix
+
+* Thu May 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.20.0-5
 - x86_64 buildfix