rpms/xdelta/devel xdelta-1.1.3-allocbug.patch, NONE, 1.1 xdelta.spec, 1.19, 1.20

[fedora-cvs-commits at redhat.com]

Author: lsmid

Update of /cvs/dist/rpms/xdelta/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15363

Modified Files:
	xdelta.spec 
Added Files:
	xdelta-1.1.3-allocbug.patch 
Log Message:
- patches created on i386 fail to apply on x86_64 (#190406)

xdelta-1.1.3-allocbug.patch:
 fh.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE xdelta-1.1.3-allocbug.patch ---
--- xdelta-1.1.3/libedsio/fh.c.allocbug	2001-06-12 05:16:41.000000000 +0200
+++ xdelta-1.1.3/libedsio/fh.c	2006-05-09 12:23:04.000000000 +0200
@@ -92,6 +92,8 @@
     {
       if (! ssource->fh->table->table_handle_getui (ssource->fh, &source->alloc_total))
 	return ST_Error;
+      /* There are 12 pointers in all required structures. So 64 bit arch needs 48 more bytes. */
+      source->alloc_total += (sizeof(void *) - 4) * 12;
     }
 
   return x;


Index: xdelta.spec
===================================================================
RCS file: /cvs/dist/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xdelta.spec	11 Feb 2006 06:08:00 -0000	1.19
+++ xdelta.spec	9 May 2006 10:48:58 -0000	1.20
@@ -1,7 +1,7 @@
 Summary: A binary file delta generator and an RCS replacement library.
 Name: xdelta
 Version: 1.1.3
-Release: 17.2.1
+Release: 18
 License: GPL
 Group: Development/Tools
 Source: http://prdownloads.sourceforge.net/xdelta/xdelta-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Patch2: xdelta-1.1.3-gcc4.patch
 Patch3: xdelta-1.1.3-edsio.patch
 Patch4: xdelta-1.1.3-glib2.patch
+Patch5: xdelta-1.1.3-allocbug.patch
 Url: http://sourceforge.net/projects/xdelta/
 BuildRequires: glib2-devel, zlib-devel
 BuildRoot: %{_tmppath}/%{name}-root
@@ -39,6 +40,7 @@
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .edsio
 %patch4 -p1 -b .glib2
+%patch5 -p1 -b .allocbug
 
 %build
 %configure
@@ -75,6 +77,9 @@
 %{_datadir}/aclocal/xdelta.m4
 
 %changelog
+* Fri May 05 2006 Ludek Smid <lsmid at redhat.com> 1.1.3-18
+- patches created on i386 fail to apply on x86_64 (#190406)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1.1.3-17.2.1
 - bump again for double-long bug on ppc(64)