From 23810ed6dc6936357dbcb050ce960b315d565585 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 8 May 2013 15:21:58 +0200
Subject: [PATCH] update to 1.0.10

---
 .gitignore                  |  1 +
 mysql-connector-python.spec | 33 ++++++++++++++++++---------------
 sources                     |  2 +-
 stripdocs.sh                | 33 ---------------------------------
 4 files changed, 20 insertions(+), 49 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 914aff7..275485a 100644
--- a/mysql-connector-python.spec
+++ b/mysql-connector-python.spec
@@ -11,17 +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
-# http://bugs.mysql.com/68509
-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)
@@ -51,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
@@ -61,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
@@ -84,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}/*
 
@@ -97,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 <remi@fedoraproject.org> - 1.0.10-1
+- version 1.0.10 GA
+- archive is now free (no more doc to strip)
+
 * Wed Feb 27 2013 Remi Collet <remi@fedoraproject.org> - 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
-