From a1b34dc4f99afbc50f1be1f93a071923cd29a2fb Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 3 Nov 2015 18:04:58 +0100 Subject: [PATCH] update to 7.19.5.3 --- pycurl-7.19.5.2-run-tests.patch | 41 --------------------------------- python-pycurl.spec | 10 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 pycurl-7.19.5.2-run-tests.patch diff --git a/pycurl-7.19.5.2-run-tests.patch b/pycurl-7.19.5.2-run-tests.patch deleted file mode 100644 index 1c899bc..0000000 --- a/pycurl-7.19.5.2-run-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ece0018e96b92a7eedd1fcea62212ec36ffb5d37 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Mon, 2 Nov 2015 16:29:16 +0100 -Subject: [PATCH] tests/run.sh: allow to override $PYTHON and $NOSETESTS - -... needed for building Fedora packages where both Python 2 and Python 3 -modules need to be built on the same system. ---- - tests/run.sh | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/tests/run.sh b/tests/run.sh -index 7bb9cd0..ca8138a 100755 ---- a/tests/run.sh -+++ b/tests/run.sh -@@ -3,8 +3,11 @@ - set -e - set -x - -+test -n "$PYTHON" || PYTHON=python -+test -n "$NOSETESTS" || NOSETESTS=nosetests -+ - mkdir -p tests/tmp --export PYTHONSUFFIX=$(python -V 2>&1 |awk '{print $2}' |awk -F. '{print $1 "." $2}') -+export PYTHONSUFFIX=$($PYTHON -V 2>&1 |awk '{print $2}' |awk -F. '{print $1 "." $2}') - export PYTHONPATH=$(ls -d build/lib.*$PYTHONSUFFIX):$PYTHONPATH - - extra_attrs= -@@ -16,6 +19,6 @@ if test "$CI" = true; then - fi - fi - --python -c 'import pycurl; print(pycurl.version)' --nosetests -a \!standalone"$extra_attrs" --with-flaky "$@" --nosetests -a standalone --with-flaky "$@" -+$PYTHON -c 'import pycurl; print(pycurl.version)' -+$NOSETESTS -a \!standalone"$extra_attrs" "$@" -+$NOSETESTS -a standalone "$@" --- -2.5.2 - diff --git a/python-pycurl.spec b/python-pycurl.spec index 66139e4..f7158e6 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -2,7 +2,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-pycurl -Version: 7.19.5.2 +Version: 7.19.5.3 Release: 1%{?dist} Summary: A Python interface to libcurl @@ -11,9 +11,6 @@ License: LGPLv2+ or MIT URL: http://pycurl.sourceforge.net/ Source0: https://github.com/pycurl/downloads/raw/master/pycurl-%{version}.tar.gz -# make tests work: http://curl.haxx.se/mail/curlpython-2015-11/0003.html -Patch1: pycurl-7.19.5.2-run-tests.patch - Requires: keyutils-libs BuildRequires: python-devel BuildRequires: python3-devel @@ -58,13 +55,13 @@ of features. %prep %setup0 -q -n pycurl-%{version} -%patch1 -p1 # temporarily exclude failing test-cases rm -f tests/{post_test,reset_test}.py # remove tests depending on the 'flaky' nose plug-in (not available in Fedora) grep '^import flaky' -r tests | cut -d: -f1 | xargs rm -fv +sed -e 's/ --with-flaky//' -i tests/run.sh # copy the whole directory for the python3 build rm -rf %{py3dir} @@ -106,6 +103,9 @@ rm -rf %{buildroot}%{_datadir}/doc/pycurl %{python3_sitearch}/* %changelog +* Tue Nov 03 2015 Kamil Dudka - 7.19.5.3-1 +- update to 7.19.5.3 + * Mon Nov 02 2015 Kamil Dudka - 7.19.5.2-1 - update to 7.19.5.2 diff --git a/sources b/sources index 72d2014..796821e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59cea96cc3027a1a7ed5020e69d4009a pycurl-7.19.5.2.tar.gz +611a5423d5c58d273294e5fdf61567e1 pycurl-7.19.5.3.tar.gz