[mysql-connector-python/el6] update to 1.0.7

[Remi Collet]

commit 977f83252c7818b6f48852bd447fae4896db8c65
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Oct 3 18:48:06 2012 +0200

    update to 1.0.7

 .gitignore                  |    3 +++
 mysql-connector-python.spec |   36 +++++++++++++++++++++++-------------
 sources                     |    2 +-
 stripdocs.sh                |   33 +++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 14 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 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 <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
+
 * Fri Aug 10 2012 Remi Collet <remi at fedoraproject.org> - 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
+