From 8fe46206a5afa40e227ac655f7aaf02937c42d02b77dcec99b585340ae64d986 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 8 Apr 2019 13:37:38 +0000 Subject: [PATCH 1/2] Accepting request 692305 from home:mcepl:branches:devel:languages:python - bsc#1128355: update to the Factory package to get multibuild and better working tests. - Refreshed patch against the new minor release tarball: - pycurl-libssh.patch - Added patches: - disable_randomly_failing_tests.patch - python-pycurl-7.43.0-tls-backend.patch (from https://src.fedoraproject.org/rpms/python-pycurl/blob/master/f/0002-python-pycurl-7.43.0-tls-backend.patch) OBS-URL: https://build.opensuse.org/request/show/692305 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=61 --- python-pycurl.changes | 12 ++++++++++++ python-pycurl.spec | 11 ++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/python-pycurl.changes b/python-pycurl.changes index ea4dcf6..9abe935 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Apr 8 15:35:42 CEST 2019 - Matej Cepl + +- bsc#1128355: update to the Factory package to get multibuild and + better working tests. +- Refreshed patch against the new minor release tarball: + - pycurl-libssh.patch +- Added patches: + - disable_randomly_failing_tests.patch + - python-pycurl-7.43.0-tls-backend.patch (from + https://src.fedoraproject.org/rpms/python-pycurl/blob/master/f/0002-python-pycurl-7.43.0-tls-backend.patch) + ------------------------------------------------------------------- Tue Mar 12 14:20:40 UTC 2019 - Matej Cepl diff --git a/python-pycurl.spec b/python-pycurl.spec index b5834c2..8c24758 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -18,19 +18,16 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} + %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" -%define test 1 +%define psuffix -test %bcond_without test %else +%define psuffix %{nil} %bcond_with test %endif - -%if %{with test} -Name: python-pycurl-%{flavor} -%else -Name: python-pycurl -%endif +Name: python-pycurl%{psuffix} Version: 7.43.0.2 Release: 0 Summary: PycURL -- cURL library module From 65a6986e5beb0e560444138ca84f57aa4e5d40a2898699fac61cc14e5bb827ab Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 8 Apr 2019 13:58:31 +0000 Subject: [PATCH 2/2] Accepting request 692312 from home:mcepl:branches:devel:languages:python More elegant use of %{with test} OBS-URL: https://build.opensuse.org/request/show/692312 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=62 --- python-pycurl.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-pycurl.spec b/python-pycurl.spec index 8c24758..4c6ed3e 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -119,14 +119,14 @@ nosetests-%{$python_bin_suffix} -v --with-flaky -a "$test_flags" rm -rf %{buildroot}%{_libexecdir}/debug %{buildroot}%{_libdir}/python* %endif # test +%if ! %{with test} %files %{python_files} %license COPYING-LGPL COPYING-MIT %doc AUTHORS ChangeLog README.rst -%if ! %{with test} %{python_sitearch}/* -%endif %files -n %{name}-doc %doc examples doc/*.rst +%endif %changelog