From a2d3ea1a312f2e732977c41388edee0fcfaed76d11b1de3eb04709e4b422c50f Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Mon, 26 May 2014 15:35:09 +0000
Subject: [PATCH] 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
---
 pycurl-no-runtime-curlvercheck.patch | 18 +-----------------
 python-pycurl.changes                |  7 +++++++
 python-pycurl.spec                   |  6 +++---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/pycurl-no-runtime-curlvercheck.patch b/pycurl-no-runtime-curlvercheck.patch
index 63167e3..2266a27 100644
--- a/pycurl-no-runtime-curlvercheck.patch
+++ b/pycurl-no-runtime-curlvercheck.patch
@@ -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));
diff --git a/python-pycurl.changes b/python-pycurl.changes
index 9f06c22..2dbf909 100644
--- a/python-pycurl.changes
+++ b/python-pycurl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 26 14:17:15 UTC 2014 - toddrme2178@gmail.com
+
+- Removed part of patch that breaks now necessary things:
+  pycurl-no-runtime-curlvercheck.patch
+- Specify ssl type since it is not automatically detected.
+
 -------------------------------------------------------------------
 Wed May 21 15:41:00 UTC 2014 - toddrme2178@gmail.com
 
diff --git a/python-pycurl.spec b/python-pycurl.spec
index 92d64a6..9c400e0 100644
--- a/python-pycurl.spec
+++ b/python-pycurl.spec
@@ -58,13 +58,13 @@ This package contains documentation and examples.
 
 %prep
 %setup -q -n pycurl-%{version}
-%patch0 -p1
+# %patch0 -p1
 
 %build
-CFLAGS="%{optflags}" python setup.py build
+CFLAGS="%{optflags}" python setup.py build --with-ssl
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot} --with-ssl
 rm -rf %{buildroot}%{_datadir}/doc # Remove wrongly installed junk
 
 %files