From edbf9ef4a37ddb63f10e8f100fcbd188c19fdff7 Mon Sep 17 00:00:00 2001
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Thu, 6 Feb 2014 17:29:32 +0200
Subject: python-pycurl: upgrade to 7.19.3

Changes:
 * Refreshed no-static-link.patch;
 * LGPL&MIT license files changed names;
 * MIT license file added a contributor to the list;
 * README.rst license snippet changed to reflect the filename changes
   and the new contributor;

(From OE-Core rev: b5b4898cd409036161c62891e9618d9ab3f891f9)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/python-pycurl/no-static-link.patch      | 20 +++++++------
 .../python/python-pycurl_7.19.0.2.bb               | 34 ----------------------
 .../python/python-pycurl_7.19.3.bb                 | 34 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb
 create mode 100644 meta/recipes-devtools/python/python-pycurl_7.19.3.bb

(limited to 'meta')

diff --git a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
index e8c0005..907380f 100644
--- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
+++ b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch
@@ -1,15 +1,17 @@
 Upstream-Status: Pending
 
-Index: pycurl-7.19.0.2/setup.py
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: pycurl-7.19.3/setup.py
 ===================================================================
---- pycurl-7.19.0.2.orig/setup.py	2013-10-08 15:28:53.000000000 +0300
-+++ pycurl-7.19.0.2/setup.py	2013-11-04 13:46:47.928292585 +0200
-@@ -101,7 +101,7 @@
-     # support one or the other of these curl-config options, so gracefully
-     # tolerate failure of either, but not both.
+--- pycurl-7.19.3.orig/setup.py	2014-01-10 08:04:40.000000000 +0200
++++ pycurl-7.19.3/setup.py	2014-02-04 15:09:08.411552887 +0200
+@@ -211,7 +211,7 @@
+     # If neither --libs nor --static-libs work, fail.
      optbuf = ""
+     errtext = ''
 -    for option in ["--libs", "--static-libs"]:
 +    for option in ["--libs"]:
-         p = subprocess.Popen("'%s' %s" % (CURL_CONFIG, option), shell=True,
-             stdout=subprocess.PIPE)
-         (stdout, stderr) = p.communicate()
+         p = subprocess.Popen((CURL_CONFIG, option),
+             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+         stdout, stderr = p.communicate()
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb b/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb
deleted file mode 100644
index aceaab3..0000000
--- a/meta/recipes-devtools/python/python-pycurl_7.19.0.2.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "Python bindings for libcurl"
-HOMEPAGE = "http://pycurl.sourceforge.net/"
-SECTION = "devel/python"
-LICENSE = "LGPLv2.1+ | MIT"
-LIC_FILES_CHKSUM = "file://README.rst;beginline=97;endline=111;md5=b5a5e531d80812bcbecbeb240fde63ef \
-                    file://COPYING;md5=3579a9fd0221d49a237aaa33492f988c \
-                    file://COPYING2;md5=ffaa1e283b7f9bf5aafd8d45db6f7518"
-
-DEPENDS = "curl python"
-RDEPENDS_${PN} = "python-core curl"
-SRCNAME = "pycurl"
-
-SRC_URI = "\
-  http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \
-  file://no-static-link.patch \
-"
-
-SRC_URI[archive.md5sum] = "518be33976dbc6838e42495ada64b43f"
-SRC_URI[archive.sha256sum] = "7a9e793b9181654d5eef3f6d22c244c57d2b51d38feb4c1b71d68efda99b0547"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-# need to export these variables for python-config to work
-export BUILD_SYS
-export HOST_SYS
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-BBCLASSEXTEND = "native"
-
-do_install_append() {
-	rm -rf ${D}${datadir}/share
-}
diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.3.bb b/meta/recipes-devtools/python/python-pycurl_7.19.3.bb
new file mode 100644
index 0000000..aee6cdd
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pycurl_7.19.3.bb
@@ -0,0 +1,34 @@
+SUMMARY = "Python bindings for libcurl"
+HOMEPAGE = "http://pycurl.sourceforge.net/"
+SECTION = "devel/python"
+LICENSE = "LGPLv2.1+ | MIT"
+LIC_FILES_CHKSUM = "file://README.rst;beginline=204;endline=219;md5=57e5ab0c0f964533fc59d93dec5695bb \
+                    file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \
+                    file://COPYING-MIT;md5=e8200955c773b2a0fd6cea36ea5e87be"
+
+DEPENDS = "curl python"
+RDEPENDS_${PN} = "python-core curl"
+SRCNAME = "pycurl"
+
+SRC_URI = "\
+  http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz;name=archive \
+  file://no-static-link.patch \
+"
+
+SRC_URI[archive.md5sum] = "b9091b7438d3de1552e28862d2971cd1"
+SRC_URI[archive.sha256sum] = "05e48835fe445ff327dcd373f49d9970e0b828a07cd4d08a23264507a742d616"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+# need to export these variables for python-config to work
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
+BBCLASSEXTEND = "native"
+
+do_install_append() {
+	rm -rf ${D}${datadir}/share
+}
-- 
cgit v1.1