From 95a20373b02ca26375834cb764c7e775d0875300 Mon Sep 17 00:00:00 2001 From: remi Date: Sun, 29 Jul 2012 07:43:07 +0200 Subject: [PATCH 01/12] changelog --- mysql-connector-python.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 7d72a6f..295beae 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ Name: mysql-connector-python Version: 0.3.2 -Release: 4%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -90,11 +90,8 @@ is necessary to run this Python DB API v2.0 compliant driver. %endif %changelog -* Fri Jul 20 2012 Fedora Release Engineering - 0.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Sun Jul 29 2012 Remi Collet 0.3.2-2 +- EL6 build * Sun Mar 20 2011 Remi Collet 0.3.2-2 - run unittest during %%check From 96d4b10632323fe153ed0bf955e28febb573e1c6 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 10 Aug 2012 08:50:14 +0200 Subject: [PATCH 02/12] update to 1.0.5 --- .gitignore | 2 ++ mysql-connector-python.spec | 32 ++++++++++++++++++++------------ sources | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index fd80d34..af95c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +*spec~ /mysql-connector-python-0.3.2-devel.tar.gz +/mysql-connector-python-1.0.5.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 295beae..93e731f 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -7,14 +7,17 @@ %endif Name: mysql-connector-python -Version: 0.3.2 -Release: 2%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages License: GPLv2 with exceptions -URL: https://launchpad.net/myconnpy -Source0: http://launchpad.net/myconnpy/0.3/%{version}/+download/%{name}-%{version}-devel.tar.gz +URL: http://dev.mysql.com/usingmysql/python/ +# 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) @@ -44,9 +47,8 @@ is necessary to run this Python DB API v2.0 compliant driver. %prep -%setup -q -n %{name}-%{version}-devel - -%{__chmod} -x python?/examples/*py +%setup -q +chmod -x python?/examples/*py %build @@ -54,12 +56,12 @@ is necessary to run this Python DB API v2.0 compliant driver. %install -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %if 0%{?with_python3} # Python 3 build %{__python3} setup.py install --root $RPM_BUILD_ROOT -%{__rm} -rf build +rm -rf build %endif # Python 2 build (end with this for tests) @@ -71,25 +73,31 @@ is necessary to run this Python DB API v2.0 compliant driver. %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc ChangeLog COPYING EXCEPTIONS-CLIENT README +%doc ChangeLog COPYING README %doc python2/examples +%doc docs %{python_sitelib}/* %if 0%{?with_python3} %files -n mysql-connector-python3 %defattr(-,root,root,-) -%doc ChangeLog COPYING EXCEPTIONS-CLIENT README +%doc ChangeLog COPYING README %doc python3/examples +%doc docs %{python3_sitelib}/* %endif %changelog +* Wed Aug 8 2012 Remi Collet - 1.0.5-1 +- version 1.0.5 (beta) +- move from launchpad (devel) to dev.mysql.com + * Sun Jul 29 2012 Remi Collet 0.3.2-2 - EL6 build diff --git a/sources b/sources index ec99825..2755b3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ffdfa21c0a870cc7080f9f9a5ee3d87 mysql-connector-python-0.3.2-devel.tar.gz +5c3c0b1ad696610a4df944cb82651c10 mysql-connector-python-1.0.5.tar.gz From f09571a16ded49ef065d210f34b4df596511d4d0 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 10 Aug 2012 10:01:38 +0200 Subject: [PATCH 03/12] increase test verbosity --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 93e731f..a645f05 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -69,7 +69,10 @@ rm -rf build %check -%{__python} unittests.py --mysql-basedir=%{_prefix} +%{__python} unittests.py \ + --mysql-basedir=%{_prefix} \ + --verbosity=1 \ + --log=tests.log %clean From 29b491470401cde3acd818cdf86d75b2700a53a2 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 10 Aug 2012 11:19:29 +0200 Subject: [PATCH 04/12] disable test_bugs with MySQL 5.1 (EL-6) --- mysql-connector-python.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index a645f05..f6b5d8b 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ Name: mysql-connector-python Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -69,11 +69,15 @@ rm -rf build %check +ver=$(mysql_config --version 2>/dev/null || echo 0) +if [ "$ver" \< "5.5" ] +then + ## Test 809033 fails with mysql 5.1 + sed -i -e '/test_bugs/d' python2/tests/__init__.py +fi %{__python} unittests.py \ --mysql-basedir=%{_prefix} \ - --verbosity=1 \ - --log=tests.log - + --verbosity=1 %clean rm -rf $RPM_BUILD_ROOT @@ -97,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Aug 10 2012 Remi Collet - 1.0.5-2 +- disable test_bugs with MySQL 5.1 (EL-6) + * Wed Aug 8 2012 Remi Collet - 1.0.5-1 - version 1.0.5 (beta) - move from launchpad (devel) to dev.mysql.com From 977f83252c7818b6f48852bd447fae4896db8c65 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Oct 2012 18:48:06 +0200 Subject: [PATCH 05/12] update to 1.0.7 --- .gitignore | 3 +++ mysql-connector-python.spec | 36 +++++++++++++++++++++++------------- sources | 2 +- stripdocs.sh | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 14 deletions(-) create mode 100755 stripdocs.sh diff --git a/.gitignore b/.gitignore index af95c6d..df6868a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ *spec~ /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 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index f6b5d8b..70db44f 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -5,19 +5,19 @@ %else %global with_python3 0 %endif +#global versuffix b2 Name: mysql-connector-python -Version: 1.0.5 -Release: 2%{?dist} +Version: 1.0.7 +Release: 1%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages License: GPLv2 with exceptions URL: http://dev.mysql.com/usingmysql/python/ -# 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 +# Launch stripdocs.sh to remove non GPL documentation +Source0: %{name}-%{version}%{?versuffix}-nodocs.tar.bz2 +Source1: stripdocs.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,12 +47,13 @@ is necessary to run this Python DB API v2.0 compliant driver. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?versuffix} chmod -x python?/examples/*py +mv docs/README.txt README-docs %build -# nothin to build +# nothing to build %install @@ -73,8 +74,14 @@ ver=$(mysql_config --version 2>/dev/null || echo 0) if [ "$ver" \< "5.5" ] then ## Test 809033 fails with mysql 5.1 - sed -i -e '/test_bugs/d' python2/tests/__init__.py + sed -e '/test_bugs/d' \ + -i python2/tests/__init__.py fi +%if 0%{?rhel} == 5 + sed -e '/test_network/d' \ + -e '/test_connection/d' \ + -i python2/tests/__init__.py +%endif %{__python} unittests.py \ --mysql-basedir=%{_prefix} \ --verbosity=1 @@ -85,22 +92,25 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc ChangeLog COPYING README +%doc ChangeLog COPYING README* %doc python2/examples -%doc docs %{python_sitelib}/* %if 0%{?with_python3} %files -n mysql-connector-python3 %defattr(-,root,root,-) -%doc ChangeLog COPYING README +%doc ChangeLog COPYING README* %doc python3/examples -%doc docs %{python3_sitelib}/* %endif %changelog +* Wed Oct 3 2012 Remi Collet - 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 - 1.0.5-2 - disable test_bugs with MySQL 5.1 (EL-6) diff --git a/sources b/sources index 2755b3a..5acdc18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c3c0b1ad696610a4df944cb82651c10 mysql-connector-python-1.0.5.tar.gz +9421b654a41f15239db4d4959c01eb6f mysql-connector-python-1.0.7-nodocs.tar.bz2 diff --git a/stripdocs.sh b/stripdocs.sh new file mode 100755 index 0000000..b28fb7a --- /dev/null +++ b/stripdocs.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +if [ "$1" = "" ]; then + echo usage $0 version + exit 1 +fi + +if [ ! -f mysql-connector-python-$1.tar.gz ]; then + echo please download mysql-connector-python-$1.tar.gz + echo http://dev.mysql.com/downloads/connector/python/ + exit 1 +fi + +tdir=`mktemp -d tmpXXXXXX` +pushd $tdir + +echo -n "unpacking..." +tar xzf ../mysql-connector-python-$1.tar.gz && echo " done" +rm -rf mysql-connector-python-$1/docs/my* +echo -n "packing..." +tar cjf ../mysql-connector-python-$1-nodocs.tar.bz2 mysql-connector-python-$1 && echo " done" + +echo -n "diffing..." +tar tzf ../mysql-connector-python-$1.tar.gz | sort >before +echo -n "..." +tar tjf ../mysql-connector-python-$1-nodocs.tar.bz2 | sort >after + +diff before after + +popd +echo "cleaning..." +rm -rf $tdir + From bd307edbaab47bf297cf55224bba485730ca090f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 29 Dec 2012 10:22:24 +0100 Subject: [PATCH 06/12] update to 1.0.8 GA --- .gitignore | 1 + mysql-connector-python.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index df6868a..a3bae76 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /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 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 70db44f..5707dfe 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ #global versuffix b2 Name: mysql-connector-python -Version: 1.0.7 +Version: 1.0.8 Release: 1%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 @@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Dec 29 2012 Remi Collet - 1.0.8-1 +- version 1.0.8 GA + * Wed Oct 3 2012 Remi Collet - 1.0.7-1 - version 1.0.7 GA - remove non GPL documentation diff --git a/sources b/sources index 5acdc18..2041f84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9421b654a41f15239db4d4959c01eb6f mysql-connector-python-1.0.7-nodocs.tar.bz2 +38655dade1b06d18ba1085ac6f00018f mysql-connector-python-1.0.8-nodocs.tar.bz2 From c1cbe661c3b414851ad4c5d898e02ac898daeb6b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Feb 2013 09:03:53 +0100 Subject: [PATCH 07/12] version 1.0.9 GA, disable test suite in mock --- .gitignore | 1 + mysql-connector-python.spec | 28 ++++++++++++++-------------- sources | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index a3bae76..68fb7a6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 5707dfe..83d9185 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -5,10 +5,13 @@ %else %global with_python3 0 %endif -#global versuffix b2 + +# 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: 1.0.8 +Version: 1.0.9 Release: 1%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 @@ -70,21 +73,14 @@ rm -rf build %check -ver=$(mysql_config --version 2>/dev/null || echo 0) -if [ "$ver" \< "5.5" ] -then - ## Test 809033 fails with mysql 5.1 - sed -e '/test_bugs/d' \ - -i python2/tests/__init__.py -fi -%if 0%{?rhel} == 5 - sed -e '/test_network/d' \ - -e '/test_connection/d' \ - -i python2/tests/__init__.py -%endif +%if %{with_tests} %{__python} unittests.py \ --mysql-basedir=%{_prefix} \ --verbosity=1 +%else +: echo test suite disabled, need '--with tests' option +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -106,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Feb 27 2013 Remi Collet - 1.0.9-1 +- version 1.0.9 GA +- disable test suite in mock, fix FTBFS #914203 + * Sat Dec 29 2012 Remi Collet - 1.0.8-1 - version 1.0.8 GA diff --git a/sources b/sources index 2041f84..c20d42a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38655dade1b06d18ba1085ac6f00018f mysql-connector-python-1.0.8-nodocs.tar.bz2 +4dcae4f24576958bfb6f02a1554f1dfe mysql-connector-python-1.0.9-nodocs.tar.bz2 From 0ed4f70bd480a024e0dfd612caa418aafb8e7d99 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 May 2013 15:12:16 +0200 Subject: [PATCH 08/12] update to 1.0.10 --- .gitignore | 1 + mysql-connector-python.spec | 32 ++++++++++++++++++-------------- sources | 2 +- stripdocs.sh | 33 --------------------------------- 4 files changed, 20 insertions(+), 48 deletions(-) delete mode 100755 stripdocs.sh diff --git a/.gitignore b/.gitignore index 68fb7a6..4f1db38 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /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 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 83d9185..5b63e40 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -11,16 +11,17 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.0.9 -Release: 1%{?versuffix:.%{versuffix}}%{?dist} +Version: 1.0.10 +Release: 1%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages License: GPLv2 with exceptions -URL: http://dev.mysql.com/usingmysql/python/ -# Launch stripdocs.sh to remove non GPL documentation -Source0: %{name}-%{version}%{?versuffix}-nodocs.tar.bz2 -Source1: stripdocs.sh +URL: http://dev.mysql.com/doc/connector-python/en/index.html +# 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) @@ -50,9 +51,8 @@ is necessary to run this Python DB API v2.0 compliant driver. %prep -%setup -q -n %{name}-%{version}%{?versuffix} +%setup -q -n %{name}-%{version} chmod -x python?/examples/*py -mv docs/README.txt README-docs %build @@ -60,16 +60,16 @@ mv docs/README.txt README-docs %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 %endif # Python 2 build (end with this for tests) -%{__python} setup.py install --root $RPM_BUILD_ROOT +%{__python} setup.py install --root %{buildroot} %check @@ -83,12 +83,12 @@ rm -rf build %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog COPYING README* +%doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python2/examples %{python_sitelib}/* @@ -96,12 +96,16 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_python3} %files -n mysql-connector-python3 %defattr(-,root,root,-) -%doc ChangeLog COPYING README* +%doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python3/examples %{python3_sitelib}/* %endif %changelog +* Wed May 8 2013 Remi Collet - 1.0.10-1 +- version 1.0.10 GA +- archive is now free (no more doc to strip) + * Wed Feb 27 2013 Remi Collet - 1.0.9-1 - version 1.0.9 GA - disable test suite in mock, fix FTBFS #914203 diff --git a/sources b/sources index c20d42a..3cfc38c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dcae4f24576958bfb6f02a1554f1dfe mysql-connector-python-1.0.9-nodocs.tar.bz2 +439c769f9121d4cf24f4f8590c5a9c00 mysql-connector-python-1.0.10.tar.gz diff --git a/stripdocs.sh b/stripdocs.sh deleted file mode 100755 index b28fb7a..0000000 --- a/stripdocs.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -if [ "$1" = "" ]; then - echo usage $0 version - exit 1 -fi - -if [ ! -f mysql-connector-python-$1.tar.gz ]; then - echo please download mysql-connector-python-$1.tar.gz - echo http://dev.mysql.com/downloads/connector/python/ - exit 1 -fi - -tdir=`mktemp -d tmpXXXXXX` -pushd $tdir - -echo -n "unpacking..." -tar xzf ../mysql-connector-python-$1.tar.gz && echo " done" -rm -rf mysql-connector-python-$1/docs/my* -echo -n "packing..." -tar cjf ../mysql-connector-python-$1-nodocs.tar.bz2 mysql-connector-python-$1 && echo " done" - -echo -n "diffing..." -tar tzf ../mysql-connector-python-$1.tar.gz | sort >before -echo -n "..." -tar tjf ../mysql-connector-python-$1-nodocs.tar.bz2 | sort >after - -diff before after - -popd -echo "cleaning..." -rm -rf $tdir - From efa419fc51a0330c80b2d233da8c9c4234431643 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Aug 2013 18:17:46 +0200 Subject: [PATCH 09/12] update to 1.0.12 (GA) --- .gitignore | 2 ++ mysql-connector-python.spec | 29 +++++++++++++++++++++-------- sources | 2 +- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4f1db38..949e6f7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /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 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 5b63e40..6006b68 100644 --- a/mysql-connector-python.spec +++ b/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-2013 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 @@ -11,7 +20,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.0.10 +Version: 1.0.12 Release: 1%{?dist} Summary: MySQL Connector for Python 2 @@ -25,12 +34,14 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel +BuildRequires: python2-devel %if 0%{?with_python3} BuildRequires: python3-devel %endif +%if %{with_tests} # for unittest BuildRequires: mysql-server +%endif %description @@ -40,8 +51,7 @@ is necessary to run this Python DB API v2.0 compliant driver. %if 0%{?with_python3} %package -n mysql-connector-python3 - -Summary: MySQL Connector for Python 3 +Summary: MySQL Connector for Python 3 %description -n mysql-connector-python3 MySQL Connector/Python is implementing the MySQL Client/Server protocol @@ -69,12 +79,12 @@ rm -rf build %endif # Python 2 build (end with this for tests) -%{__python} setup.py install --root %{buildroot} +%{__python2} setup.py install --root %{buildroot} %check %if %{with_tests} -%{__python} unittests.py \ +%{__python2} unittests.py \ --mysql-basedir=%{_prefix} \ --verbosity=1 %else @@ -90,7 +100,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python2/examples -%{python_sitelib}/* +%{python2_sitelib}/* %if 0%{?with_python3} @@ -102,6 +112,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Aug 26 2013 Remi Collet - 1.0.12-1 +- version 1.0.12 GA + * Wed May 8 2013 Remi Collet - 1.0.10-1 - version 1.0.10 GA - archive is now free (no more doc to strip) diff --git a/sources b/sources index 3cfc38c..e0ae4d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -439c769f9121d4cf24f4f8590c5a9c00 mysql-connector-python-1.0.10.tar.gz +caac07dc8fa08d1f55ad0c51491d2ba7 mysql-connector-python-1.0.12.tar.gz From 45b2b6e93946be7105818098c1957604b66ac9a0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Dec 2013 15:55:14 +0100 Subject: [PATCH 10/12] - 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 - 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 - 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 From dfecf1329493c6b8f1a65e56be37d9b0fb99b513 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Feb 2014 08:34:29 +0100 Subject: [PATCH 11/12] Update to 1.1.5 GA (cherry picked from commit 6cdcbae025b22994d20b9dd8ebe93b1dad1b5486) --- .gitignore | 1 + mysql-connector-python.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 81cb596..d5631ec 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /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 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index f6da97a..56d21d4 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -1,6 +1,6 @@ # spec file for mysql-connector-python # -# Copyright (c) 2011-2013 Remi Collet +# Copyright (c) 2011-2014 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/3.0/ # @@ -20,7 +20,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.1.4 +Version: 1.1.5 Release: 1%{?dist} Summary: MySQL Connector for Python 2 @@ -124,6 +124,10 @@ rm -rf %{buildroot} %endif %changelog +* Tue Feb 4 2014 Remi Collet - 1.1.5-1 +- 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 - 1.1.4-1 - version 1.1.4 GA http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1.html diff --git a/sources b/sources index 59fd6c4..342a5fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b5885a0ab65fd996ff49a303bca5ce7 mysql-connector-python-1.1.4.tar.gz +011c80ad921ceba36e07a1b24297621c mysql-connector-python-1.1.5.tar.gz From e816171c00a66fafe2956f8027631600718f547f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Apr 2014 17:54:14 +0200 Subject: [PATCH 12/12] update to 1.1.6 (cherry picked from commit 5ba8e0b75f505afcf4e118c525a605707135a5f4) --- .gitignore | 1 + mysql-connector-python.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d5631ec..fe70d78 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /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 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 56d21d4..3d5e4ec 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.1.5 +Version: 1.1.6 Release: 1%{?dist} Summary: MySQL Connector for Python 2 @@ -124,6 +124,10 @@ rm -rf %{buildroot} %endif %changelog +* Wed Apr 16 2014 Remi Collet - 1.1.6-1 +- version 1.1.6 GA + http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-6.html + * Tue Feb 4 2014 Remi Collet - 1.1.5-1 - version 1.1.5 GA http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-5.html diff --git a/sources b/sources index 342a5fa..8d39781 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -011c80ad921ceba36e07a1b24297621c mysql-connector-python-1.1.5.tar.gz +99e1b5d8bd4d5d4ff4b20683305988d7 mysql-connector-python-1.1.6.tar.gz