python-psycopg2: Renamed patch

Added the reason for why it is necessary and the UpstreamStatus
to the patch.

Signed-off-by: Mihai Prica <prica.mihai@gmail.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2/quick-fix.patch b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
index 0fa6e5e..104d692 100644
--- a/meta-openstack/recipes-devtools/python/python-psycopg2/quick-fix.patch
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
@@ -1,17 +1,20 @@
+Upstream-status: Inappropriate [embedded specific]
+
+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.
+
 Index: psycopg2-2.5/setup.py
 ===================================================================
 --- psycopg2-2.5.orig/setup.py
 +++ psycopg2-2.5/setup.py
-@@ -377,9 +377,9 @@ class psycopg_build_ext(build_ext):
+@@ -377,9 +377,6 @@ class psycopg_build_ext(build_ext):
              self.libraries.append("pq")
  
          try:
 -            self.library_dirs.append(pg_config_helper.query("libdir"))
 -            self.include_dirs.append(pg_config_helper.query("includedir"))
 -            self.include_dirs.append(pg_config_helper.query("includedir-server"))
-+            #self.library_dirs.append(pg_config_helper.query("libdir"))
-+            #self.include_dirs.append(pg_config_helper.query("includedir"))
-+            #self.include_dirs.append(pg_config_helper.query("includedir-server"))
              try:
                  # Here we take a conservative approach: we suppose that
                  # *at least* PostgreSQL 7.4 is available (this is the only
diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb
index 5206ae0..c93e62b 100644
--- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.5.bb
@@ -9,7 +9,7 @@ PR = "r0"
 SRCNAME = "psycopg2"
 
 SRC_URI = "https://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://quick-fix.patch"
+           file://remove-pg-config.patch"
 
 SRC_URI[md5sum] = "facd82faa067e99b80146a0ee2f842f6"
 SRC_URI[sha256sum] = "6b2f0cc9199de9eaa53ba10ff69b2741e73484b24657e69bdae259561c23bde4"