rpms/MySQL-python/F-7 MySQL-python.spec,1.29,1.30 setup.py,1.2,1.3

Tom Lane (tgl) fedora-extras-commits at redhat.com
Tue Jul 3 19:54:30 UTC 2007


Author: tgl

Update of /cvs/pkgs/rpms/MySQL-python/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30676

Modified Files:
	MySQL-python.spec setup.py 
Log Message:
Fix bogus fix for bug #243877; see bug #246366


Index: MySQL-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-python/F-7/MySQL-python.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- MySQL-python.spec	12 Jun 2007 19:14:05 -0000	1.29
+++ MySQL-python.spec	3 Jul 2007 19:53:55 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: An interface to MySQL
 Name: MySQL-python
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Libraries
 URL: http://sourceforge.net/projects/mysql-python/
@@ -67,6 +67,11 @@
 %dir /usr/%{_lib}/python?.?/site-packages/MySQLdb/constants
 
 %changelog
+* Tue Jul  3 2007 Tom Lane <tgl at redhat.com> 1.2.2-3
+- Ooops, previous fix for quoting bug was wrong, because it converted the
+  version_info tuple to a string in Python's eyes
+Resolves: #246366
+
 * Tue Jun 12 2007 Tom Lane <tgl at redhat.com> 1.2.2-2
 - Fix quoting bug in use of older setup.py: need to quote version_info now
 Resolves: #243877


Index: setup.py
===================================================================
RCS file: /cvs/pkgs/rpms/MySQL-python/F-7/setup.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setup.py	12 Jun 2007 19:14:05 -0000	1.2
+++ setup.py	3 Jul 2007 19:53:55 -0000	1.3
@@ -83,13 +83,13 @@
     extra_objects.append(os.path.join(
         library_dirs[0],'lib%s.a' % client))
 
-extra_compile_args.append("-Dversion_info=\"%s\"" % metadata['version_info'])
-extra_compile_args.append("-D__version__=\"%s\"" % metadata['version'])
+extra_compile_args.append("-Dversion_info=%s" % metadata['version_info'])
+extra_compile_args.append("-D__version__=%s" % metadata['version'])
 
 rel = open("MySQLdb/release.py",'w')
 rel.write("""
 __author__ = "%(author)s <%(author_email)s>"
-version_info = "%(version_info)s"
+version_info = %(version_info)s
 __version__ = "%(version)s"
 """ % metadata)
 rel.close()




More information about the scm-commits mailing list