diff --git a/.gitignore b/.gitignore
index fd80d34..df6868a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +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 40ada50..ba94293 100644
--- a/mysql-connector-python.spec
+++ b/mysql-connector-python.spec
@@ -5,16 +5,19 @@
 %else
 %global with_python3 0
 %endif
+#global versuffix    b2
 
 Name:           mysql-connector-python
-Version:        0.3.2
-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:            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/
+# 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)
@@ -44,22 +47,22 @@ 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 -n %{name}-%{version}%{?versuffix}
+chmod -x python?/examples/*py
+mv docs/README.txt README-docs
 
 
 %build
-# nothin to build
+# nothing to build
 
 
 %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)
@@ -67,16 +70,29 @@ is necessary to run this Python DB API v2.0 compliant driver.
 
 
 %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
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING EXCEPTIONS-CLIENT README
+%doc ChangeLog COPYING README*
 %doc python2/examples
 %{python_sitelib}/*
 
@@ -84,12 +100,22 @@ is necessary to run this Python DB API v2.0 compliant driver.
 %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
 %{python3_sitelib}/*
 %endif
 
 %changelog
+* Wed Oct  3 2012 Remi Collet <remi@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@fedoraproject.org> - 1.0.5-1
+- version 1.0.5 (beta)
+- move from launchpad (devel) to dev.mysql.com
+
 * Sun Mar 20 2011 Remi Collet <Fedora@famillecollet.com> 0.3.2-2
 - run unittest during %%check
 - fix License
diff --git a/sources b/sources
index ec99825..5acdc18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ffdfa21c0a870cc7080f9f9a5ee3d87  mysql-connector-python-0.3.2-devel.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
+