From b2048d33355d90c0b9cf848351e21936438a3ab5 Mon Sep 17 00:00:00 2001 From: remi Date: Sat, 11 Aug 2012 16:20:41 +0200 Subject: [PATCH 1/2] 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 40ada50..89fc0bd 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 Mar 20 2011 Remi Collet 0.3.2-2 - run unittest during %%check - fix License 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 0b1417b5f2277801024f693aab34e9bb464e4668 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Oct 2012 18:38:02 +0200 Subject: [PATCH 2/2] update to 1.0.7 --- .gitignore | 3 +++ mysql-connector-python.spec | 46 ++++++++++++++++++++++++++----------- sources | 2 +- stripdocs.sh | 33 ++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 15 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 89fc0bd..ba94293 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: 1%{?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 @@ -69,8 +70,21 @@ rm -rf build %check -%{__python} unittests.py --mysql-basedir=%{_prefix} - +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 +%{__python} unittests.py \ + --mysql-basedir=%{_prefix} \ + --verbosity=1 %clean rm -rf $RPM_BUILD_ROOT @@ -78,22 +92,26 @@ 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 +- 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 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 +