From 8efbdb85a85e7b56f94e448546db72891e1f9586 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@cn.fujitsu.com>
Date: Fri, 31 Jul 2015 15:26:57 +0800
Subject: python-psycopg2: upgrade 2.5->2.6.1

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-psycopg2_2.5.bb    | 19 -------------------
 .../recipes-devtools/python/python-psycopg2_2.6.1.bb  | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-psycopg2_2.6.1.bb

diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb
deleted file mode 100644
index c92842e..0000000
--- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Python-PostgreSQL Database Adapter"
-HOMEPAGE = "http://initd.org/psycopg/"
-SECTION = "devel/python"
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2c9872d13fa571e7ba6de95055da1fe2"
-DEPENDS = "postgresql"
-
-PR = "r0"
-SRCNAME = "psycopg2"
-
-SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://remove-pg-config.patch"
-
-SRC_URI[md5sum] = "facd82faa067e99b80146a0ee2f842f6"
-SRC_URI[sha256sum] = "6b2f0cc9199de9eaa53ba10ff69b2741e73484b24657e69bdae259561c23bde4"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.1.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.1.bb
new file mode 100644
index 0000000..8882903
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Python-PostgreSQL Database Adapter"
+HOMEPAGE = "http://initd.org/psycopg/"
+SECTION = "devel/python"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2c9872d13fa571e7ba6de95055da1fe2"
+DEPENDS = "postgresql"
+
+PR = "r0"
+SRCNAME = "psycopg2"
+
+SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+          "
+
+SRC_URI[md5sum] = "842b44f8c95517ed5b792081a2370da1"
+SRC_URI[sha256sum] = "6acf9abbbe757ef75dc2ecd9d91ba749547941abaffbe69ff2086a9e37d4904c"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
-- 
cgit v1.2.3-54-g00ecf