From 8d7f4c29b277d0d694192f7d48cff5aadaba0811e262a0fd024bc69a5a96cfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 9 Dec 2017 12:42:07 +0000 Subject: [PATCH] Accepting request 555317 from home:apersaud:branches:devel:languages:python update to latest version OBS-URL: https://build.opensuse.org/request/show/555317 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=32 --- increase_test_timeout.diff | 6 +++--- pycurl-7.43.0.1.tar.gz | 3 +++ pycurl-7.43.0.tar.gz | 3 --- pycurl-no-runtime-curlvercheck.patch | 13 ------------- python-pycurl.changes | 12 ++++++++++++ python-pycurl.spec | 7 ++----- 6 files changed, 20 insertions(+), 24 deletions(-) create mode 100644 pycurl-7.43.0.1.tar.gz delete mode 100644 pycurl-7.43.0.tar.gz delete mode 100644 pycurl-no-runtime-curlvercheck.patch diff --git a/increase_test_timeout.diff b/increase_test_timeout.diff index 4076db1..ec514e7 100644 --- a/increase_test_timeout.diff +++ b/increase_test_timeout.diff @@ -2,16 +2,16 @@ Index: pycurl-7.43.0/tests/runwsgi.py =================================================================== --- pycurl-7.43.0.orig/tests/runwsgi.py +++ pycurl-7.43.0/tests/runwsgi.py -@@ -55,10 +55,10 @@ def start_bottle_server(app, port, serve +@@ -48,10 +48,10 @@ def start_bottle_server(app, port, serve server_thread.daemon = True server_thread.start() - + - ok = util.wait_for_network_service(('127.0.0.1', port), 0.1, 10) + ok = util.wait_for_network_service(('127.0.0.1', port), 0.1, 30) if not ok: import warnings - warnings.warn('Server did not start after 1 second') + warnings.warn('Server did not start after 3 seconds') - + return server_thread.server diff --git a/pycurl-7.43.0.1.tar.gz b/pycurl-7.43.0.1.tar.gz new file mode 100644 index 0000000..c9f62e5 --- /dev/null +++ b/pycurl-7.43.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43231bf2bafde923a6d9bb79e2407342a5f3382c1ef0a3b2e491c6a4e50b91aa +size 195861 diff --git a/pycurl-7.43.0.tar.gz b/pycurl-7.43.0.tar.gz deleted file mode 100644 index 5320502..0000000 --- a/pycurl-7.43.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa975c19b79b6aa6c0518c0cc2ae33528900478f0b500531dbcdbf05beec584c -size 182522 diff --git a/pycurl-no-runtime-curlvercheck.patch b/pycurl-no-runtime-curlvercheck.patch deleted file mode 100644 index 4527e47..0000000 --- a/pycurl-no-runtime-curlvercheck.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pycurl-7.19.5/src/module.c -=================================================================== ---- pycurl-7.19.5.orig/src/module.c -+++ pycurl-7.19.5/src/module.c -@@ -416,7 +416,7 @@ initpycurl(void) - #undef PYCURL_VERSION_PREFIX_SIZE - - insstr_modinit(d, "version", g_pycurl_useragent); -- insstr_modinit(d, "COMPILE_DATE", __DATE__ " " __TIME__); -+ //insstr_modinit(d, "COMPILE_DATE", __DATE__ " " __TIME__); - insint(d, "COMPILE_PY_VERSION_HEX", PY_VERSION_HEX); - insint(d, "COMPILE_LIBCURL_VERSION_NUM", LIBCURL_VERSION_NUM); - diff --git a/python-pycurl.changes b/python-pycurl.changes index cf05e6c..40a1652 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Dec 8 18:06:28 UTC 2017 - arun@gmx.de + +- refreshed patch increase_test_timeout.diff (updated line number) + +- removed patch pycurl-no-runtime-curlvercheck.patch (included upstream) + +- update to version 7.43.0.1: + * This release collects fixes and improvements made over the past + two years,notably updating Windows dependencies to address DNS + resolution andTLS connection issues. + ------------------------------------------------------------------- Tue Aug 8 19:16:32 UTC 2017 - tbechtold@suse.com diff --git a/python-pycurl.spec b/python-pycurl.spec index 5b8e835..d32975b 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -19,17 +19,15 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pycurl -Version: 7.43.0 +Version: 7.43.0.1 Release: 0 Summary: PycURL -- cURL library module License: LGPL-2.1+ and MIT Group: Development/Languages/Python Url: http://pycurl.sourceforge.net/ Source: https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-%{version}.tar.gz -# PATCH-FIX-UPSTREAM remove __DATE__ and __TIME__ -Patch0: pycurl-no-runtime-curlvercheck.patch # PATCH-FIX-OPENSUSE increase_test_timeout.diff -- Increase the timeout in a test so it doesn't fail when obs is overloaded -Patch1: increase_test_timeout.diff +Patch0: increase_test_timeout.diff BuildRequires: %{python_module bottle} BuildRequires: %{python_module devel} BuildRequires: %{python_module flaky} @@ -63,7 +61,6 @@ This package contains documentation and examples. %prep %setup -q -n pycurl-%{version} %patch0 -p1 -%patch1 -p1 %build export CFLAGS="%{optflags}"