From 3376f0e2323f771a9eaab57d97deb07fc5ced952 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Jul 29 2013 14:34:50 +0000 Subject: import MySQL-python-1.2.3-8.el7.src.rpm --- diff --git a/.MySQL-python.metadata b/.MySQL-python.metadata new file mode 100644 index 0000000..9aa7196 --- /dev/null +++ b/.MySQL-python.metadata @@ -0,0 +1 @@ +3511bb8c57c6016eeafa531d5c3ea4b548915e3c SOURCES/MySQL-python-1.2.3.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/MySQL-python-no-openssl.patch b/SOURCES/MySQL-python-no-openssl.patch new file mode 100644 index 0000000..438df84 --- /dev/null +++ b/SOURCES/MySQL-python-no-openssl.patch @@ -0,0 +1,53 @@ +mysql 5.5 does not export a HAVE_OPENSSL symbol, thus breaking MySQL-python's +rather-misguided-anyway conditional compilation for SSL support. Since we +have no intention of ever shipping a non-SSL-enabled mysql in Fedora/RHEL, +we can just drop the conditionals, pending some other fix upstream. +(Since mysql_ssl_set is supposed to exist anyway, this might well be a +suitable fix for upstream too.) + + +diff -Naur MySQL-python-1.2.3.orig/_mysql.c MySQL-python-1.2.3/_mysql.c +--- MySQL-python-1.2.3.orig/_mysql.c 2010-06-17 03:21:56.000000000 -0400 ++++ MySQL-python-1.2.3/_mysql.c 2012-07-14 16:49:31.590349235 -0400 +@@ -475,10 +475,8 @@ + MYSQL *conn = NULL; + PyObject *conv = NULL; + PyObject *ssl = NULL; +-#if HAVE_OPENSSL + char *key = NULL, *cert = NULL, *ca = NULL, + *capath = NULL, *cipher = NULL; +-#endif + char *host = NULL, *user = NULL, *passwd = NULL, + *db = NULL, *unix_socket = NULL; + unsigned int port = 0; +@@ -519,18 +517,12 @@ + PyErr_Clear();} + + if (ssl) { +-#if HAVE_OPENSSL + PyObject *value = NULL; + _stringsuck(ca, value, ssl); + _stringsuck(capath, value, ssl); + _stringsuck(cert, value, ssl); + _stringsuck(key, value, ssl); + _stringsuck(cipher, value, ssl); +-#else +- PyErr_SetString(_mysql_NotSupportedError, +- "client library does not have SSL support"); +- return -1; +-#endif + } + + Py_BEGIN_ALLOW_THREADS ; +@@ -556,11 +548,9 @@ + if (local_infile != -1) + mysql_options(&(self->connection), MYSQL_OPT_LOCAL_INFILE, (char *) &local_infile); + +-#if HAVE_OPENSSL + if (ssl) + mysql_ssl_set(&(self->connection), + key, cert, ca, capath, cipher); +-#endif + + conn = mysql_real_connect(&(self->connection), host, user, passwd, db, + port, unix_socket, client_flag); diff --git a/SPECS/MySQL-python.spec b/SPECS/MySQL-python.spec new file mode 100644 index 0000000..57c7bf8 --- /dev/null +++ b/SPECS/MySQL-python.spec @@ -0,0 +1,252 @@ +Summary: An interface to MySQL +Name: MySQL-python +Version: 1.2.3 +Release: 8%{?dist} +License: GPLv2+ +Group: Development/Libraries +URL: http://sourceforge.net/projects/mysql-python/ + +Source0: http://prdownloads.sourceforge.net/mysql-python/MySQL-python-%{version}.tar.gz + +Patch1: MySQL-python-no-openssl.patch + +BuildRequires: python2-devel python-setuptools +BuildRequires: mysql-devel zlib-devel +# is this still needed? +# Requires: mx + +%description +Python interface to MySQL + +MySQLdb is an interface to the popular MySQL database server for Python. +The design goals are: + +- Compliance with Python database API version 2.0 +- Thread-safety +- Thread-friendliness (threads will not block each other) +- Compatibility with MySQL 3.23 and up + +This module should be mostly compatible with an older interface +written by Joe Skinner and others. However, the older version is +a) not thread-friendly, b) written for MySQL 3.21, c) apparently +not actively maintained. No code from that version is used in MySQLdb. + +%prep +%setup -q -n %{name}-%{version} + +%patch1 -p1 + +%build +rm -f doc/*~ +export libdirname=%{_lib} +CFLAGS="$RPM_OPT_FLAGS" python setup.py build + +%install +export libdirname=%{_lib} +python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES + +%files -f INSTALLED_FILES +%doc README doc/* +%dir %{python_sitearch}/MySQLdb +%{python_sitearch}/MySQLdb/*.pyo +%{python_sitearch}/MySQLdb/constants/*.pyo +%{python_sitearch}/*.pyo +%dir %{python_sitearch}/MySQLdb/constants + +%changelog +* Mon Jul 29 2013 Honza Horak - 1.2.3-8 +- Spec file clean-up, use proper python paths + +* Wed Feb 13 2013 Fedora Release Engineering - 1.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.2.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jul 14 2012 Tom Lane 1.2.3-5 +- Fix failure to enable SSL support with mysql 5.5, per Matthias Runge + +* Thu Jan 12 2012 Fedora Release Engineering - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Mar 22 2011 Tom Lane 1.2.3-3 +- Rebuild for libmysqlclient 5.5.10 soname version bump + +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 24 2010 Tom Lane 1.2.3-1 +- Update to final release of 1.2.3 +Resolves: #660484 +- Rebuild was needed anyway for mysql ABI break (no more libmysqlclient_r) + +* Wed Jul 21 2010 David Malcolm - 1.2.3-0.5.c1 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Nov 23 2009 Tom Lane 1.2.3-0.4.c1 +- Fix format mismatch in _mysql_ConnectionObject_kill +Resolves: #538234 + +* Fri Aug 21 2009 Tomas Mraz - 1.2.3-0.3.c1 +- rebuilt with new openssl + +* Fri Jul 24 2009 Fedora Release Engineering - 1.2.3-0.2.c1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Jun 28 2009 Tom Lane 1.2.3-0.1.c1 +- Update to release candidate 1.2.3c1 for better mysql 5.1 and python 2.6 + compatibility +Resolves: #505611 +- Use python-setuptools instead of distutils, stop using old setup.py +Resolves: #467510 +- Remove unnecessary manual Requires: specifications +Resolves: #507750 + +* Wed Apr 15 2009 Karsten Hopp 1.2.2-11 +- bump release and rebuild for s390x + +* Mon Feb 23 2009 Fedora Release Engineering - 1.2.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Jan 22 2009 Tom Lane 1.2.2-9 +- Rebuild for mysql 5.1 + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.2.2-8 +- Rebuild for Python 2.6 + +* Thu Jun 19 2008 Tom Lane 1.2.2-7 +- Fix broken escape() method +Resolves: #331021 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.2.2-6 +- Autorebuild for GCC 4.3 + +* Wed Dec 5 2007 Tom Lane 1.2.2-5 +- Rebuild for new openssl + +* Thu Aug 2 2007 Tom Lane 1.2.2-4 +- Update License tag to match code. + +* Tue Jul 3 2007 Tom Lane 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 1.2.2-2 +- Fix quoting bug in use of older setup.py: need to quote version_info now +Resolves: #243877 + +* Fri Apr 20 2007 Tom Lane 1.2.2-1 +- Update to 1.2.2, but not 1.2.2 setup.py (since we don't ship setuptools yet) + +* Thu Dec 7 2006 Jeremy Katz - 1.2.1_p2-2 +- rebuild for python 2.5 + +* Wed Dec 6 2006 Tom Lane 1.2.1_p2-1 +- Update to 1.2.1_p2 + +* Fri Jul 21 2006 Tom Lane 1.2.1-1 +- Update to 1.2.1 +- Remove hardwired python version number in favor of asking Python + +* Wed Jul 12 2006 Jesse Keating - 1.2.0-3.2.2.1 +- rebuild + +* Mon Feb 13 2006 Jesse Keating - 1.2.0-3.2.2 +- rebump for build order issues during double-long bump + +* Fri Feb 10 2006 Jesse Keating - 1.2.0-3.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.2.0-3.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Nov 9 2005 Tom Lane 1.2.0-3 +- Rebuild due to mysql 5.0 update and openssl library update. + +* Wed Aug 03 2005 Karsten Hopp 1.2.0-2 +- package all python files. INSTALLED_FILES doesn't contain files created + by the brp-python-bytecompile script + +* Thu Apr 21 2005 Tom Lane 1.2.0-1 +- Update to 1.2.0, per bug #155341 +- Link against mysql 4.x not 3.x, per bug #150828 + +* Sun Mar 6 2005 Tom Lane 1.0.0-3 +- Rebuild with gcc4. + +* Thu Nov 11 2004 Tom Lane 1.0.0-2 +- bring us to python 2.4 + +* Thu Nov 11 2004 Tom Lane 1.0.0-1 +- update to 1.0.0; rebuild against mysqlclient10 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 20 2004 Tom Lane +- reinstate (and update) patch for /usr/lib64 compatibility +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Nov 25 2003 Patrick Macdonald 0.9.2-1 +- update to 0.9.2 +- remove patches (no longer applicable) + +* Sat Nov 15 2003 Tom "spot" Callaway 0.9.1-10 +- bring us to python 2.3 + +* Thu Jul 03 2003 Patrick Macdonald 0.9.1-9 +- rebuilt + +* Wed Jun 04 2003 Elliot Lee 0.9.1-8 +- rebuilt + +* Tue Mar 04 2003 Patrick Macdonald 0.9.1-7 +- explicitly define the constants directory in case a more + restrictive umask is encountered (#74019) + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Tim Powers 0.9.1-5 +- lib64'ize + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon May 13 2002 Trond Eivind Glomsrd 0.9.1-2 +- Build for newer python + +* Wed Mar 13 2002 Trond Eivind Glomsrd 0.9.1-1 +- 0.9.1 + +* Tue Feb 26 2002 Trond Eivind Glomsrd 0.9.0-6 +- Rebuild + +* Thu Jan 31 2002 Elliot Lee 0.9.0-5 +- Change python conflicts to requires +- Use pybasever/pynextver macros. + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Sep 14 2001 Trond Eivind Glomsrd 0.9.0-3 +- Build for Python 2.2 + +* Mon Jul 23 2001 Trond Eivind Glomsrd +- Add zlib-devel to buildrequires (#49788) + +* Tue Jun 19 2001 Trond Eivind Glomsrd +- Initial build