- rel 2; allow passing only some ssl arguments or set them to None (fixed in devel...

diff --git a/python-mysql-connector-ssl.patch b/python-mysql-connector-ssl.patch
new file mode 100644 (file)
index 0000000..f01a835
--- /dev/null
+++ b/python-mysql-connector-ssl.patch
@@ -0,0 +1,24 @@
+diff -ur mysql-connector-python-1.1.6.org/python2/mysql/connector/connection.py mysql-connector-python-1.1.6/python2/mysql/connector/connection.py
+--- mysql-connector-python-1.1.6.org/python2/mysql/connector/connection.py     2014-02-11 22:37:14.000000000 +0100
++++ mysql-connector-python-1.1.6/python2/mysql/connector/connection.py 2014-02-26 14:43:44.219350687 +0100
+@@ -296,7 +296,7 @@
+             if key == 'ssl_verify_cert':
+                 set_ssl_flag = True
+                 self._ssl.update({'verify_cert': value})
+-            elif key.startswith('ssl_') and value:
++            elif key.startswith('ssl_'):
+                 set_ssl_flag = True
+                 self._ssl.update({key.replace('ssl_', ''): value})
+             else:
+diff -ur mysql-connector-python-1.1.6.org/python3/mysql/connector/connection.py mysql-connector-python-1.1.6/python3/mysql/connector/connection.py
+--- mysql-connector-python-1.1.6.org/python3/mysql/connector/connection.py     2014-02-11 22:37:14.000000000 +0100
++++ mysql-connector-python-1.1.6/python3/mysql/connector/connection.py 2014-02-26 14:43:53.192986440 +0100
+@@ -295,7 +295,7 @@
+             if key == 'ssl_verify_cert':
+                 set_ssl_flag = True
+                 self._ssl.update({'verify_cert': value})
+-            elif key.startswith('ssl_') and value:
++            elif key.startswith('ssl_'):
+                 set_ssl_flag = True
+                 self._ssl.update({key.replace('ssl_', ''): value})
+             else:

diff --git a/python-mysql-connector.spec b/python-mysql-connector.spec
index 37f25dae2e942d8ff4e685efd54d3cdfa4f7a35f..5e86cf51a9e49dc52e8ff0f472fc3c35a23329ee 100644 (file)
--- a/python-mysql-connector.spec
+++ b/python-mysql-connector.spec
@@ -8,11 +8,13 @@ Summary:      The MySQL Client/Protocol implemented in Python
 Name:          python-%{pname}
 # check documentation to see which version is GA (we don't want devel releases)
 Version:       1.1.6
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Libraries/Python
 Source0:       http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-%{version}.zip
 # Source0-md5: 026e4a4b8731da33d73f0542349594fd
+# drop after python connector >= 1.2.1
+Patch0:                %{name}-ssl.patch
 URL:           http://dev.mysql.com/doc/connector-python/en/
 BuildRequires: python-modules
 %{?with_python3:BuildRequires: python3-modules}
@@ -40,6 +42,7 @@ driver. An interface to the popular MySQL database server for Python.
 
 %prep
 %setup -q -n mysql-connector-python-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build