- up to 2.1.3; switch to c-extension version (so no longer noarch)

diff --git a/python-mysql-connector.spec b/python-mysql-connector.spec
index 45868aa46b26d04c64696ffa2c4a9e46c140c08b..9bff94e4b6c0ec0c8cf14df50d07f5aed0ecea0a 100644 (file)
--- a/python-mysql-connector.spec
+++ b/python-mysql-connector.spec
@@ -1,3 +1,5 @@
+# TODO:
+# - c extension build is done in install phase (http://bugs.mysql.com/bug.php?id=78621)
 #
 # Conditional build:
 %bcond_with            tests           # build with tests (requires mysql server)
@@ -8,18 +10,19 @@ 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)
 # https://dev.mysql.com/downloads/connector/python/
-Version:       2.0.4
-Release:       3
+Version:       2.1.3
+Release:       1
 License:       GPL v2
 Group:         Libraries/Python
 Source0:       http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-%{version}.zip
-# Source0-md5: 3df394d89300db95163f17c843ef49df
+# Source0-md5: 710479afc4f7895207c8f96f91eb5385
 URL:           http://dev.mysql.com/doc/connector-python/en/
+BuildRequires: mysql-devel
+BuildRequires: python-devel
 BuildRequires: python-modules
 %{?with_python3:BuildRequires: python3-modules}
 BuildRequires: rpm-pythonprov
 Requires:      python-modules
-BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__python} -- setup.py \
        install \
+       --with-mysql-capi=%{_prefix} \
        --root=$RPM_BUILD_ROOT \
        --optimize=2
 
@@ -65,6 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__python3} -- setup.py \
        build -b build-3 \
        install \
+       --with-mysql-capi=%{_prefix} \
        --root=$RPM_BUILD_ROOT \
        --optimize=2
 %endif
@@ -75,49 +80,51 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt README.txt
-%dir %{py_sitescriptdir}/mysql
-%{py_sitescriptdir}/mysql/*.py[co]
-%dir %{py_sitescriptdir}/mysql/connector
-%{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
-%{py_sitescriptdir}/mysql/connector/locales/eng/*.py[co]
+%attr(755,root,root) %{py_sitedir}/_mysql_connector.so
+%dir %{py_sitedir}/mysql
+%{py_sitedir}/mysql/*.py[co]
+%dir %{py_sitedir}/mysql/connector
+%{py_sitedir}/mysql/connector/*.py[co]
+%dir %{py_sitedir}/mysql/connector/django
+%{py_sitedir}/mysql/connector/django/*.py[co]
+%dir %{py_sitedir}/mysql/connector/fabric
+%{py_sitedir}/mysql/connector/fabric/*.py[co]
+%dir %{py_sitedir}/mysql/connector/locales
+%{py_sitedir}/mysql/connector/locales/*.py[co]
+%dir %{py_sitedir}/mysql/connector/locales/eng
+%{py_sitedir}/mysql/connector/locales/eng/*.py[co]
 %if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/mysql_connector_python-*.egg-info
+%{py_sitedir}/mysql_connector_python-*.egg-info
 %endif
 
 %if %{with python3}
 %files -n python3-%{pname}
 %defattr(644,root,root,755)
 %doc CHANGES.txt README.txt
-%{py3_sitescriptdir}/mysql*.egg-info
-%dir %{py3_sitescriptdir}/mysql
-%{py3_sitescriptdir}/mysql/*.py
-%dir %{py3_sitescriptdir}/mysql/__pycache__
-%{py3_sitescriptdir}/mysql/__pycache__/*.py[co]
-%dir %{py3_sitescriptdir}/mysql/connector
-%{py3_sitescriptdir}/mysql/connector/*.py
-%dir %{py3_sitescriptdir}/mysql/connector/__pycache__
-%{py3_sitescriptdir}/mysql/connector/__pycache__/*.py[co]
-%dir %{py3_sitescriptdir}/mysql/connector/django
-%{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__
-%{py3_sitescriptdir}/mysql/connector/locales/__pycache__/*.py[co]
-%dir %{py3_sitescriptdir}/mysql/connector/locales/eng
-%{py3_sitescriptdir}/mysql/connector/locales/eng/*.py
-%dir %{py3_sitescriptdir}/mysql/connector/locales/eng/__pycache__
-%{py3_sitescriptdir}/mysql/connector/locales/eng/__pycache__/*.py[co]
+%attr(755,root,root) %{py3_sitedir}/_mysql_connector.cpython-*.so
+%{py3_sitedir}/mysql*.egg-info
+%dir %{py3_sitedir}/mysql
+%{py3_sitedir}/mysql/*.py
+%dir %{py3_sitedir}/mysql/__pycache__
+%{py3_sitedir}/mysql/__pycache__/*.py[co]
+%dir %{py3_sitedir}/mysql/connector
+%{py3_sitedir}/mysql/connector/*.py
+%dir %{py3_sitedir}/mysql/connector/__pycache__
+%{py3_sitedir}/mysql/connector/__pycache__/*.py[co]
+%dir %{py3_sitedir}/mysql/connector/django
+%{py3_sitedir}/mysql/connector/django/*.py
+%dir %{py3_sitedir}/mysql/connector/django/__pycache__
+%{py3_sitedir}/mysql/connector/django/__pycache__/*.py[co]
+%dir %{py3_sitedir}/mysql/connector/fabric
+%{py3_sitedir}/mysql/connector/fabric/*.py
+%dir %{py3_sitedir}/mysql/connector/fabric/__pycache__
+%{py3_sitedir}/mysql/connector/fabric/__pycache__/*.py[co]
+%dir %{py3_sitedir}/mysql/connector/locales
+%{py3_sitedir}/mysql/connector/locales/*.py
+%dir %{py3_sitedir}/mysql/connector/locales/__pycache__
+%{py3_sitedir}/mysql/connector/locales/__pycache__/*.py[co]
+%dir %{py3_sitedir}/mysql/connector/locales/eng
+%{py3_sitedir}/mysql/connector/locales/eng/*.py
+%dir %{py3_sitedir}/mysql/connector/locales/eng/__pycache__
+%{py3_sitedir}/mysql/connector/locales/eng/__pycache__/*.py[co]
 %endif