python/python-pycurl
SHA256
14
0
Fork 0
forked from pool/python-pycurl
Code Pull Requests Activity

Accepting request 197050 from devel:languages:python

Browse Source 
- remove runtime curl version check and __DATE__ __TIME__ usage 
  (pycurl-no-runtime-curlvercheck.patch) (forwarded request 196933 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/197050
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pycurl?expand=0&rev=10
This commit is contained in:
Stephan Kulow
2013-09-03 20:03:54 +00:00
committed by Git OBS Bridge
parent 5333a5d88f 1e59230168
commit 50d1507157
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pycurl-no-runtime-curlvercheck.patch Normal file
View File

@@ -0,0 +1,27 @@
--- pycurl-7.19.0.orig/src/pycurl.c
+++ pycurl-7.19.0/src/pycurl.c
@@ -3450,7 +3450,7 @@ initpycurl(void)
/* Add version strings to the module */
insstr(d, "version", curl_version());
- insstr(d, "COMPILE_DATE", __DATE__ " " __TIME__);
+ //insstr(d, "COMPILE_DATE", __DATE__ " " __TIME__);
insint(d, "COMPILE_PY_VERSION_HEX", PY_VERSION_HEX);
insint(d, "COMPILE_LIBCURL_VERSION_NUM", LIBCURL_VERSION_NUM);
@@ -3883,6 +3883,7 @@ initpycurl(void)
insint_s(d, "LOCK_DATA_COOKIE", CURL_LOCK_DATA_COOKIE);
insint_s(d, "LOCK_DATA_DNS", CURL_LOCK_DATA_DNS);
+#if 0
/* Check the version, as this has caused nasty problems in
* some cases. */
vi = curl_version_info(CURLVERSION_NOW);
@@ -3894,6 +3895,7 @@ initpycurl(void)
Py_FatalError("pycurl: libcurl link-time version is older than compile-time version");
assert(0);
}
+#endif
/* Initialize callback locks if ssl is enabled */
#if defined(PYCURL_NEED_SSL_TSL)

6
python-pycurl.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 30 18:07:30 UTC 2013 - crrodriguez@opensuse.org
- remove runtime curl version check and __DATE__ __TIME__ usage
(pycurl-no-runtime-curlvercheck.patch)
-------------------------------------------------------------------
Fri Apr 5 13:16:51 UTC 2013 - idonmez@suse.com

3
python-pycurl.spec
View File

@@ -25,6 +25,7 @@ License: LGPL-2.1+ and MIT
Group: Development/Languages/Python
Source: http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz
Patch0: pycurl-7.18.1-nostaticlibs.patch
Patch1: pycurl-no-runtime-curlvercheck.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libcurl-devel >= 7.19.0
BuildRequires: openssl-devel
@@ -52,7 +53,7 @@ This package contains documentation and examples.
%prep
%setup -q -n pycurl-%{version}
%patch0
%patch1 -p1
%build
CFLAGS="%{optflags}" python setup.py build