From ba8faa75ff54ca02f0d8afad42ecf0251d59fb94 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 27 May 2014 19:16:01 +0200 Subject: [PATCH] - up to 1.2.2; first GA release --- python-mysql-connector-ssl.patch | 24 ------------------------ python-mysql-connector.spec | 13 ++++++++----- 2 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 python-mysql-connector-ssl.patch diff --git a/python-mysql-connector-ssl.patch b/python-mysql-connector-ssl.patch deleted file mode 100644 index f01a835..0000000 --- a/python-mysql-connector-ssl.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 9d9b651..ca99231 100644 --- a/python-mysql-connector.spec +++ b/python-mysql-connector.spec @@ -7,14 +7,12 @@ 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.7 +Version: 1.2.2 Release: 1 License: GPL v2 Group: Libraries/Python Source0: http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-%{version}.zip -# Source0-md5: f5bf75bb9551e523dc6db369b236c6a3 -# drop after python connector >= 1.2.1 -Patch0: %{name}-ssl.patch +# Source0-md5: 1459adcda19858629585d356ef481180 URL: http://dev.mysql.com/doc/connector-python/en/ BuildRequires: python-modules %{?with_python3:BuildRequires: python3-modules} @@ -42,7 +40,6 @@ 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 @@ -83,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT %{py_sitescriptdir}/mysql/connector/*.py[co] %dir %{py_sitescriptdir}/mysql/connector/django %{py_sitescriptdir}/mysql/connector/django/*.py[co] +%dir %{py_sitescriptdir}/mysql/connector/fabric +%{py_sitescriptdir}/mysql/connector/fabric/*.py[co] %dir %{py_sitescriptdir}/mysql/connector/locales %{py_sitescriptdir}/mysql/connector/locales/*.py[co] %dir %{py_sitescriptdir}/mysql/connector/locales/eng @@ -108,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT %{py3_sitescriptdir}/mysql/connector/django/*.py %dir %{py3_sitescriptdir}/mysql/connector/django/__pycache__ %{py3_sitescriptdir}/mysql/connector/django/__pycache__/*.py[co] +%dir %{py3_sitescriptdir}/mysql/connector/fabric +%{py3_sitescriptdir}/mysql/connector/fabric/*.py +%dir %{py3_sitescriptdir}/mysql/connector/fabric/__pycache__ +%{py3_sitescriptdir}/mysql/connector/fabric/__pycache__/*.py[co] %dir %{py3_sitescriptdir}/mysql/connector/locales %{py3_sitescriptdir}/mysql/connector/locales/*.py %dir %{py3_sitescriptdir}/mysql/connector/locales/__pycache__ -- 2.44.0