mysql-python: upgrade to 1.2.5

remove the remove-distribute.patch, v1.2.5 has a similar fix

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 3 insertions, 22 deletions

diff --git a/meta-oe/recipes-support/mysql/mysql-python/remove-distribute.patch b/meta-oe/recipes-support/mysql/mysql-python/remove-distribute.patch
deleted file mode 100644
index 0ce750d63..000000000
--- a/meta-oe/recipes-support/mysql/mysql-python/remove-distribute.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Innapropriate
-
-Index: MySQL-python-1.2.4/setup.py
-===================================================================
---- MySQL-python-1.2.4.orig/setup.py
-+++ MySQL-python-1.2.4/setup.py
-@@ -3,8 +3,8 @@
- import os
- import sys
- 
--from distribute_setup import use_setuptools
--use_setuptools()
-+#from distribute_setup import use_setuptools
-+#use_setuptools()
- from setuptools import setup, Extension
- 
- if not hasattr(sys, "hexversion") or sys.hexversion < 0x02040000:
diff --git a/meta-oe/recipes-support/mysql/mysql-python_1.2.4.bb b/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb
index 6fc974ecd..ac0df4f06 100644
--- a/meta-oe/recipes-support/mysql/mysql-python_1.2.4.bb
+++ b/meta-oe/recipes-support/mysql/mysql-python_1.2.5.bb
@@ -8,11 +8,9 @@ DEPENDS = "mysql5"
 
 SRCNAME = "MySQL-python"
 
-SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \
-           file://remove-distribute.patch"
-
-SRC_URI[md5sum] = "ddf2386daf10a97af115ffad2ed4a9a0"
-SRC_URI[sha256sum] = "e405f9d6be33923d428acaa4db4f4470427f1d15ea0d2d82a933449ace26bbd9"
+SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip"
+SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
+SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"