[mysql-connector-python/f17] update to 1.0.7
Remi Collet
remi at fedoraproject.org
Wed Oct 3 15:44:53 UTC 2012
commit a59b2383feb5d4aca796dd6279eb9571de759f81
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed Oct 3 17:44:45 2012 +0200
update to 1.0.7
.gitignore | 3 ++
mysql-connector-python.spec | 46 +++++++++++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 36 insertions(+), 15 deletions(-)
---
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 3855c34..d0ee1ca 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 <remi at fedoraproject.org> - 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 <remi at fedoraproject.org> - 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
More information about the scm-commits
mailing list