update to 1.1.6

(cherry picked from commit 5ba8e0b75f)

.gitignore

@@ -1 +1,15 @@
+mysql-connector-python.spec~
+clog
 /mysql-connector-python-0.3.2-devel.tar.gz
+/mysql-connector-python-1.0.5.tar.gz
+/mysql-connector-python-1.0.6b1-nodocs.tar.bz2
+/mysql-connector-python-1.0.6b2-nodocs.tar.bz2
+/mysql-connector-python-1.0.7-nodocs.tar.bz2
+/mysql-connector-python-1.0.8-nodocs.tar.bz2
+/mysql-connector-python-1.0.9-nodocs.tar.bz2
+/mysql-connector-python-1.0.10.tar.gz
+/mysql-connector-python-1.0.11.tar.gz
+/mysql-connector-python-1.0.12.tar.gz
+/mysql-connector-python-1.1.4.tar.gz
+/mysql-connector-python-1.1.5.tar.gz
+/mysql-connector-python-1.1.6.tar.gz

mysql-connector-python.spec

@@ -1,4 +1,13 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+# spec file for mysql-connector-python
+#
+# Copyright (c) 2011-2014 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Please, preserve the changelog entries
+#
+%{!?__python2:       %global __python2 %{__python}}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %if 0%{?fedora} >= 13
 %global with_python3 1
@@ -6,24 +15,33 @@
 %global with_python3 0
 %endif
 
+# Tests only run on manual build --with tests
+# Tests rely on MySQL version 5.6
+%global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+
 Name:           mysql-connector-python
-Version:        0.3.2
+Version:        1.1.6
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        MySQL Connector for Python 2
 
 Group:          Development/Languages
 License:        GPLv2 with exceptions
-URL:            https://launchpad.net/myconnpy
+URL:            http://dev.mysql.com/doc/connector-python/en/index.html
-Source0:        http://launchpad.net/myconnpy/0.3/%{version}/+download/%{name}-%{version}-devel.tar.gz
+# Upstream has a mirror redirector for downloads, so the URL is hard to
+# represent statically.  You can get the tarball by following a link from
+# http://dev.mysql.com/downloads/connector/python/
+Source0:        %{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  python-devel
+BuildRequires:  python2-devel >= 2.6
 %if 0%{?with_python3}
-BuildRequires:  python3-devel
+BuildRequires:  python3-devel >= 3
 %endif
+%if %{with_tests}
 # for unittest
 BuildRequires:  mysql-server
+%endif
 
 
 %description
@@ -31,70 +49,123 @@ MySQL Connector/Python is implementing the MySQL Client/Server protocol
 completely in Python. No MySQL libraries are needed, and no compilation
 is necessary to run this Python DB API v2.0 compliant driver.
 
+Documentation: http://dev.mysql.com/doc/connector-python/en/index.html
+
+
 %if 0%{?with_python3}
 %package -n mysql-connector-python3
-
 Summary: MySQL Connector for Python 3
 
 %description -n mysql-connector-python3
 MySQL Connector/Python is implementing the MySQL Client/Server protocol
 completely in Python. No MySQL libraries are needed, and no compilation
 is necessary to run this Python DB API v2.0 compliant driver.
+
+Documentation: http://dev.mysql.com/doc/connector-python/en/index.html
 %endif
 
 
 %prep
-%setup -q -n %{name}-%{version}-devel
+%setup -q -n %{name}-%{version}
-
+chmod -x python?/examples/*py
-%{__chmod} -x python?/examples/*py
 
 
 %build
-# nothin to build
+# nothing to build
 
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %if 0%{?with_python3}
 # Python 3 build
-%{__python3} setup.py install --root $RPM_BUILD_ROOT
+%{__python3} setup.py install --root %{buildroot}
-%{__rm} -rf build
+rm -rf build
 %endif
 
 # Python 2 build (end with this for tests)
-%{__python} setup.py install --root $RPM_BUILD_ROOT
+%{__python2} setup.py install --root %{buildroot}
 
 
 %check
-%{__python} unittests.py --mysql-basedir=%{_prefix}
+%if %{with_tests}
+# known failed tests
+# bugs.BugOra14201459.test_error1426
+
+%{__python2} unittests.py \
+    --with-mysql=%{_prefix} \
+    --verbosity=1
+
+%{__python3} unittests.py \
+    --with-mysql=%{_prefix} \
+    --verbosity=1
+%else
+: echo test suite disabled, need '--with tests' option
+%endif
 
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING EXCEPTIONS-CLIENT README
+%doc ChangeLog COPYING README* docs/README_DOCS.txt
 %doc python2/examples
-%{python_sitelib}/*
+%{python2_sitelib}/*
 
 
 %if 0%{?with_python3}
 %files -n mysql-connector-python3
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING EXCEPTIONS-CLIENT README
+%doc ChangeLog COPYING README* docs/README_DOCS.txt
 %doc python3/examples
 %{python3_sitelib}/*
 %endif
 
 %changelog
-* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-4
+* Wed Apr 16 2014 Remi Collet <remi@fedoraproject.org> - 1.1.6-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+- version 1.1.6 GA
+  http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-6.html
 
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-3
+* Tue Feb  4 2014 Remi Collet <remi@fedoraproject.org> - 1.1.5-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+- version 1.1.5 GA
+  http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-5.html
+
+* Tue Dec 17 2013 Remi Collet <remi@fedoraproject.org> - 1.1.4-1
+- version 1.1.4 GA
+  http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1.html
+- add link to documentation in package description
+- raise dependency on python 2.6
+
+* Mon Aug 26 2013 Remi Collet <remi@fedoraproject.org> - 1.0.12-1
+- version 1.0.12 GA
+
+* Wed May  8 2013 Remi Collet <remi@fedoraproject.org> - 1.0.10-1
+- version 1.0.10 GA
+- archive is now free (no more doc to strip)
+
+* Wed Feb 27 2013 Remi Collet <remi@fedoraproject.org> - 1.0.9-1
+- version 1.0.9 GA
+- disable test suite in mock, fix FTBFS #914203
+
+* Sat Dec 29 2012 Remi Collet <remi@fedoraproject.org> - 1.0.8-1
+- version 1.0.8 GA
+
+* Wed Oct  3 2012 Remi Collet <remi@fedoraproject.org> - 1.0.7-1
+- version 1.0.7 GA
+- remove non GPL documentation
+- disable test_network and test_connection on EL-5
+
+* Fri Aug 10 2012 Remi Collet <remi@fedoraproject.org> - 1.0.5-2
+- disable test_bugs with MySQL 5.1 (EL-6)
+
+* Wed Aug  8 2012 Remi Collet <remi@fedoraproject.org> - 1.0.5-1
+- version 1.0.5 (beta)
+- move from launchpad (devel) to dev.mysql.com
+
+* Sun Jul 29 2012 Remi Collet <remi@fedoraproject.org> 0.3.2-2
+- EL6 build
 
 * Sun Mar 20 2011 Remi Collet <Fedora@famillecollet.com> 0.3.2-2
 - run unittest during %%check

sources

@@ -1 +1 @@
-2ffdfa21c0a870cc7080f9f9a5ee3d87  mysql-connector-python-0.3.2-devel.tar.gz
+99e1b5d8bd4d5d4ff4b20683305988d7  mysql-connector-python-1.1.6.tar.gz