rpms/xmldiff/FC-4 xmldiff-0.6.7-x64safe.patch, NONE, 1.1 xmldiff.spec, 1.5, 1.6

Paul W. Frields (pfrields) fedora-extras-commits at redhat.com
Sat Feb 4 20:00:46 UTC 2006


Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16134

Modified Files:
	xmldiff.spec 
Added Files:
	xmldiff-0.6.7-x64safe.patch 
Log Message:
Include x86_64 patch and remove ExcludeArch (thanks Ville Skytta); 0.6.7-9

xmldiff-0.6.7-x64safe.patch:

--- NEW FILE xmldiff-0.6.7-x64safe.patch ---
diff -Nru xmldiff-0.6.7-orig/extensions/maplookup.c xmldiff-0.6.7/extensions/maplookup.c
--- xmldiff-0.6.7-orig/extensions/maplookup.c	2005-05-03 17:28:45.000000000 +0200
+++ xmldiff-0.6.7/extensions/maplookup.c	2005-06-24 18:08:39.327922316 +0200
@@ -1,5 +1,6 @@
 #include <Python.h>
 #include <stdio.h>
+#include <inttypes.h>
 
 char * __revision__ = "$Id: maplookup.c,v 1.9 2005/04/30 11:59:47 ludal Exp $";
 
@@ -156,11 +157,19 @@
     {
       PyObject *key ;
       couple = PyList_GET_ITEM(_mapping, i) ;
-      key = Py_BuildValue("(i,i)", (int)node1, (int)PyTuple_GET_ITEM(couple, 0)) ;
+#if __WORDSIZE == 64
+      key = Py_BuildValue("(l,l)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ;
+#else
+      key = Py_BuildValue("(i,i)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ;
+#endif
       if (PyDict_GetItem(_dict1, key) != NULL)
 	{
 	  Py_DECREF(key) ;
-	  key = Py_BuildValue("(i,i)", (int)node2, (int)PyTuple_GET_ITEM(couple, 1)) ;
+#if __WORDSIZE == 64
+	  key = Py_BuildValue("(l,l)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ;
+#else
+	  key = Py_BuildValue("(i,i)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ;
+#endif
 	  if (PyDict_GetItem(_dict2, key) != NULL)
 	    {
 	      seq_num += 1 ;


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xmldiff.spec	28 Jan 2006 22:30:19 -0000	1.5
+++ xmldiff.spec	4 Feb 2006 20:00:46 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -13,6 +13,7 @@
 Source1:	GPL
 Patch0:		xmldiff-0.6.7-xsldata.patch
 Patch1:		xmldiff-0.6.7-clean-tmp.patch
+Patch2:		xmldiff-0.6.7-x64safe.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -24,8 +25,6 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
-# see bug #177083
-ExcludeArch:	x86_64
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -39,6 +38,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 for i in man/*.1 __pkginfo__.py doc/*.txt
 do
 	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Sat Feb  4 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-9
+- Include x86_64 patch and remove ExcludeArch (thanks to Ville Skytta)
+
 * Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-8
 - ExcludeArch includes spurious values from misplaced comment
 




More information about the fedora-extras-commits mailing list