From 45b2b6e93946be7105818098c1957604b66ac9a0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 17 Dec 2013 15:55:14 +0100
Subject: [PATCH] - 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

(cherry picked from commit 1a6cd639c14c055c24bf2820adddabead96278f8)
---
 .gitignore                  |  4 +++-
 mysql-connector-python.spec | 26 ++++++++++++++++++++++----
 sources                     |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 949e6f7..81cb596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-*spec~
+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
@@ -9,3 +10,4 @@
 /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
diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec
index 6006b68..f6da97a 100644
--- a/mysql-connector-python.spec
+++ b/mysql-connector-python.spec
@@ -20,7 +20,7 @@
 %global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
 
 Name:           mysql-connector-python
-Version:        1.0.12
+Version:        1.1.4
 Release:        1%{?dist}
 Summary:        MySQL Connector for Python 2
 
@@ -34,9 +34,9 @@ Source0:        %{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  python2-devel
+BuildRequires:  python2-devel >= 2.6
 %if 0%{?with_python3}
-BuildRequires:  python3-devel
+BuildRequires:  python3-devel >= 3
 %endif
 %if %{with_tests}
 # for unittest
@@ -49,6 +49,9 @@ 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
@@ -57,6 +60,8 @@ Summary: MySQL Connector for Python 3
 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
 
 
@@ -84,8 +89,15 @@ rm -rf build
 
 %check
 %if %{with_tests}
+# known failed tests
+# bugs.BugOra14201459.test_error1426
+
 %{__python2} unittests.py \
-    --mysql-basedir=%{_prefix} \
+    --with-mysql=%{_prefix} \
+    --verbosity=1
+
+%{__python3} unittests.py \
+    --with-mysql=%{_prefix} \
     --verbosity=1
 %else
 : echo test suite disabled, need '--with tests' option
@@ -112,6 +124,12 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index e0ae4d0..59fd6c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caac07dc8fa08d1f55ad0c51491d2ba7  mysql-connector-python-1.0.12.tar.gz
+1b5885a0ab65fd996ff49a303bca5ce7  mysql-connector-python-1.1.4.tar.gz