rpms/metakit/devel metakit-64bit.patch, NONE, 1.1 metakit.spec, 1.8, 1.9

[Jeremy Katz (katzj)]

Author: katzj

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

Modified Files:
	metakit.spec 
Added Files:
	metakit-64bit.patch 
Log Message:
* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.4.9.3-7
- fix for 64bit problems; initial patch from Ignacio, more from me (#159460)


metakit-64bit.patch:

--- NEW FILE metakit-64bit.patch ---
--- metakit-2.4.9.3/python/PyRowRef.cpp.64bit	2004-01-20 20:46:06.000000000 -0500
+++ metakit-2.4.9.3/python/PyRowRef.cpp	2005-05-25 16:29:02.000000000 -0400
@@ -24,12 +24,12 @@
 }
 
 static int PyRowRef_print(PyRowRef *o, FILE *f, int) {
-  fprintf(f, "<PyRowRef object at %x>", (int)o);
+  fprintf(f, "<PyRowRef object at %zx>", o);
   return 0;
 }
 
 static int PyRORowRef_print(PyRowRef *o, FILE *f, int) {
-  fprintf(f, "<PyRORowRef object at %x>", (int)o);
+  fprintf(f, "<PyRORowRef object at %zx>", o);
   return 0;
 }
 
--- metakit-2.4.9.3/python/PyView.cpp.64bit	2005-05-25 16:30:09.000000000 -0400
+++ metakit-2.4.9.3/python/PyView.cpp	2005-05-25 16:30:42.000000000 -0400
@@ -971,15 +971,15 @@
 }
 
 static int PyView_print(PyView *o, FILE *f, int) {
-  fprintf(f, "<PyView object at %x>", (int)o);
+  fprintf(f, "<PyView object at %zx>", o);
   return 0;
 }
 static int PyViewer_print(PyView *o, FILE *f, int) {
-  fprintf(f, "<PyViewer object at %x>", (int)o);
+  fprintf(f, "<PyViewer object at %zx>", o);
   return 0;
 }
 static int PyROViewer_print(PyView *o, FILE *f, int) {
-  fprintf(f, "<PyROViewer object at %x>", (int)o);
+  fprintf(f, "<PyROViewer object at %zx>", o);
   return 0;
 }
 


Index: metakit.spec
===================================================================
RCS file: /cvs/extras/rpms/metakit/devel/metakit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metakit.spec	23 May 2005 10:42:20 -0000	1.8
+++ metakit.spec	25 May 2005 20:33:22 -0000	1.9
@@ -7,11 +7,12 @@
 Summary: Embeddable database
 Name: metakit
 Version: 2.4.9.3
-Release: 6
+Release: 7
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.equi4.com/metakit/
 Source: http://www.equi4.com/pub/mk/metakit-%{version}.tar.gz
+Patch0: metakit-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: tcl, python
 BuildRequires: gcc-c++, tcl-devel, python-devel
@@ -35,7 +36,8 @@
 
 
 %prep
-%setup
+%setup -q
+%patch0 -p1 -b .64bit
 
 
 %build
@@ -83,6 +85,9 @@
 
 
 %changelog
+* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.4.9.3-7
+- fix for 64bit problems; initial patch from Ignacio, more from me (#159460)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.4.9.3-6
 - rebuild on all arches