14
0
forked from pool/python-pycurl

Accepting request 235419 from home:TheBlackCat:branches:devel:languages:python

- Removed part of patch that breaks now necessary things:
  pycurl-no-runtime-curlvercheck.patch
- Specify ssl type since it is not automatically detected.

OBS-URL: https://build.opensuse.org/request/show/235419
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=21
This commit is contained in:
Todd R
2014-05-26 15:35:09 +00:00
committed by Git OBS Bridge
parent 6f03fb134b
commit a2d3ea1a31
3 changed files with 11 additions and 20 deletions

View File

@@ -1,22 +1,6 @@
--- a/src/pycurl.c 2014-02-06 10:27:56.000000000 +0100
+++ b/src/pycurl.c 2014-05-20 16:09:57.513592172 +0200
@@ -4440,6 +4440,7 @@
const char *libcurl_version, *runtime_ssl_lib;
int libcurl_version_len, pycurl_version_len;
+#if 0
/* Check the version, as this has caused nasty problems in
* some cases. */
vi = curl_version_info(CURLVERSION_NOW);
@@ -4451,6 +4452,7 @@
PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time version (%s) is older than compile-time version (%s)", vi->version, LIBCURL_VERSION);
PYCURL_MODINIT_RETURN_NULL;
}
+#endif
/* Our compiled crypto locks should correspond to runtime ssl library. */
if (vi->ssl_version == NULL) {
@@ -4526,7 +4528,7 @@
@@ -4526,7 +4526,7 @@
#undef PYCURL_VERSION_PREFIX_SIZE
insobj2(d, NULL, "version", PyText_FromString(g_pycurl_useragent));