rpms/MySQL-python/devel format-mismatch.patch, NONE, 1.1 MySQL-python.spec, 1.41, 1.42

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/MySQL-python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31022

Modified Files:
	MySQL-python.spec 
Added Files:
	format-mismatch.patch 
Log Message:
Fix format mismatch in _mysql_ConnectionObject_kill

format-mismatch.patch:
 _mysql.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE format-mismatch.patch ---
Fix for bug #538234


diff -Naur MySQL-python-1.2.3c1.orig/_mysql.c MySQL-python-1.2.3c1/_mysql.c
--- MySQL-python-1.2.3c1.orig/_mysql.c	2009-03-30 18:59:28.000000000 -0400
+++ MySQL-python-1.2.3c1/_mysql.c	2009-11-23 12:58:41.000000000 -0500
@@ -1714,7 +1714,7 @@
 {
 	unsigned long pid;
 	int r;
-	if (!PyArg_ParseTuple(args, "i:kill", &pid)) return NULL;
+	if (!PyArg_ParseTuple(args, "l:kill", &pid)) return NULL;
 	check_connection(self);
 	Py_BEGIN_ALLOW_THREADS
 	r = mysql_kill(&(self->connection), pid);


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-python/devel/MySQL-python.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- MySQL-python.spec	21 Aug 2009 12:17:35 -0000	1.41
+++ MySQL-python.spec	23 Nov 2009 18:13:41 -0000	1.42
@@ -1,12 +1,13 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.3
-Release: 0.3.c1%{?dist}
+Release: 0.4.c1%{?dist}
 License: GPLv2+
 Group: Development/Libraries
 URL: http://sourceforge.net/projects/mysql-python/
 
 Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}c1.tar.gz
+Patch1: format-mismatch.patch
 Patch2: escape-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -34,6 +35,7 @@ not actively maintained. No code from th
 %prep
 %setup -q -n %{name}-%{version}c1
 
+%patch1 -p1
 %patch2 -p1
 
 %build
@@ -60,6 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/%{_lib}/python?.?/site-packages/MySQLdb/constants
 
 %changelog
+* Mon Nov 23 2009 Tom Lane <tgl at redhat.com> 1.2.3-0.4.c1
+- Fix format mismatch in _mysql_ConnectionObject_kill
+Resolves: #538234
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.3-0.3.c1
 - rebuilt with new openssl