rpms/4Suite/devel 4Suite-1.0a4-format.patch, NONE, 1.1 4Suite.spec, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/4Suite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26595

Modified Files:
	4Suite.spec 
Added Files:
	4Suite-1.0a4-format.patch 
Log Message:
* Sun Mar 20 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-7.a4
- Fix format string on 64-bit platforms


4Suite-1.0a4-format.patch:
 StreamWriter.c |   11 +----------
 1 files changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE 4Suite-1.0a4-format.patch ---
--- 4Suite-1.0a4/Ft/Xml/src/StreamWriter.c.format	2005-03-20 18:37:40.597138272 +0100
+++ 4Suite-1.0a4/Ft/Xml/src/StreamWriter.c	2005-03-20 18:38:06.602184904 +0100
@@ -164,15 +164,6 @@
   return result;
 }
 
-/* Note: use decimal form due to some broken browsers. */
-#ifdef Py_UNICODE_WIDE
-/* UCS-4 build (wide) */
-#define XML_CHARREF_FMTSTR "&#%ld;"
-#else
-/* UCS-2 build (narrow) */
-#define XML_CHARREF_FMTSTR "&#%d;"
-#endif
-
 static int write_escaped(PyStreamWriterObject *self, PyObject *unicode)
 {
   PyObject *data;
@@ -195,7 +186,7 @@
       if (!data) {
         /* Found an offending character */
         PyErr_Clear();
-        sprintf(charref, XML_CHARREF_FMTSTR, *unistr);
+        sprintf(charref, "&#%ld;", (long)*unistr);
         data = PyString_FromString(charref);
         if (!data) {
           return -1;


Index: 4Suite.spec
===================================================================
RCS file: /cvs/dist/rpms/4Suite/devel/4Suite.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- 4Suite.spec	20 Mar 2005 17:24:43 -0000	1.20
+++ 4Suite.spec	20 Mar 2005 17:48:35 -0000	1.21
@@ -3,10 +3,11 @@
 Summary: A collections of XML-related technologies for python
 Name: 4Suite
 Version: 1.0
-Release: 6.a4
+Release: 7.a4
 Source: ftp://ftp.fourthought.com/pub/4Suite/4Suite-1.0a4.tar.bz2
 Patch0: 4Suite-1.0a4-root.patch
 Patch1: 4Suite-1.0a4-gcc.patch
+Patch2: 4Suite-1.0a4-format.patch
 License: Apacheish
 Group: Development/Libraries
 Requires: python, PyXML >= 0.7, Distutils
@@ -42,6 +43,7 @@
 %setup -q -n 4Suite-1.0a4
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -66,6 +68,9 @@
 /var/lib/4Suite
 
 %changelog
+* Sun Mar 20 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-7.a4
+- Fix format string on 64-bit platforms
+
 * Sat Mar 19 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-6.a4
 - Fix build with gcc 4
 - Update to 4Suite-1.0a4