python-psycopg2: 2.6.1 -> 2.6.2

1) Upgrade python-psycopg2 from 2.6.1 to 2.6.2.
2) Modify remove-pg-config.patch, since the data has been changed.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 17 insertions, 23 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
index b2f94dd..37acc30 100644
--- a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
@@ -1,37 +1,31 @@
-From 392c4581da49f133938e70f6215bfebba28ecc56 Mon Sep 17 00:00:00 2001
+From 92d42775735d1555449b860c214ca7265d7ad75b Mon Sep 17 00:00:00 2001
 From: Mark Asselstine <mark.asselstine@windriver.com>
-Date: Tue, 4 Aug 2015 20:59:18 -0400
+Date: Tue, 24 Jan 2017 00:43:35 +0900
 Subject: [PATCH] setup: don't use pg_config
 
-The package uses the pg_config command to detect the libdir and
-includedir path.  Commented the lines because the command is not
-available at buildtime and the package succesfully build without them.
-
-Signed-off-by: Mark Asselstine <bruce.ashfield@windriver.com>
 Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
 ---
- setup.cfg | 2 +-
+ setup.cfg | 1 +
  setup.py  | 5 +----
- 2 files changed, 2 insertions(+), 5 deletions(-)
+ 2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/setup.cfg b/setup.cfg
-index 90a47dd..986871b 100644
+index d00ce92..4b45aac 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -9,7 +9,7 @@ define=
- # build psycopg2. If pg_config is not in the path or is installed under a
- # different name uncomment the following option and set it to the pg_config
- # full path.
--#pg_config=
+@@ -1,5 +1,6 @@
+ [build_ext]
+ define = 
 +pg_config="/bin/true"
+ use_pydatetime = 1
+ have_ssl = 0
  
- # Set to 1 to use Python datetime objects for default date/time representation.
- use_pydatetime=1
 diff --git a/setup.py b/setup.py
-index 975fe10..85502ca 100644
+index d71d489..b101696 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -389,16 +389,13 @@ class psycopg_build_ext(build_ext):
+@@ -398,16 +398,13 @@ class psycopg_build_ext(build_ext):
              self.libraries.append("pq")
  
          try:
@@ -50,5 +44,5 @@ index 975fe10..85502ca 100644
              verre = re.compile(
                  r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+))")
 -- 
-2.1.4
+2.7.4
 
diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.1.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb
index 1d78afa..2cdb138 100644
--- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb
@@ -8,12 +8,12 @@ DEPENDS = "postgresql"
 PR = "r0"
 SRCNAME = "psycopg2"
 
-SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
+SRC_URI = "https://pypi.python.org/packages/7b/a8/dc2d50a6f37c157459cd18bab381c8e6134b9381b50fbe969997b2ae7dbc/${SRCNAME}-${PV}.tar.gz \
            file://remove-pg-config.patch \
           "
 
-SRC_URI[md5sum] = "842b44f8c95517ed5b792081a2370da1"
-SRC_URI[sha256sum] = "6acf9abbbe757ef75dc2ecd9d91ba749547941abaffbe69ff2086a9e37d4904c"
+SRC_URI[md5sum] = "4a392949ba31a378a18ed3e775a4693f"
+SRC_URI[sha256sum] = "70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"