From 0d81b01f4f88985eade02aaf7bd3a63325531101c516b90309e9b20527aadb87 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 14 Dec 2020 17:20:19 +0000 Subject: [PATCH] Accepting request 855783 from home:bnavigator:branches:devel:languages:python - If you skip_python2 you don't need mock. mcepl: This still has the wrong condition, we talked about yesterday. OBS-URL: https://build.opensuse.org/request/show/855783 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=110 --- python-urllib3.changes | 5 +++++ python-urllib3.spec | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/python-urllib3.changes b/python-urllib3.changes index ccbb66f..158a52b 100644 --- a/python-urllib3.changes +++ b/python-urllib3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 14 15:21:26 UTC 2020 - Benjamin Greiner + +- If you skip_python2 you don't need mock. + ------------------------------------------------------------------- Sun Dec 13 21:46:22 UTC 2020 - Matej Cepl diff --git a/python-urllib3.spec b/python-urllib3.spec index 2b41477..300c1d4 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -18,7 +18,6 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 -%define oldpython python %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -54,10 +53,6 @@ Requires: python-six >= 1.12.0 Recommends: python-PySocks >= 1.5.6 Recommends: python-brotlipy >= 0.6.0 BuildArch: noarch -# for SSL module on older distros -%if 0%{?suse_version} < 1500 -BuildRequires: %{oldpython} -%endif %if %{with test} BuildRequires: %{python_module PySocks >= 1.5.6} BuildRequires: %{python_module brotlipy >= 0.6.0} @@ -75,9 +70,6 @@ BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module tornado >= 6} BuildRequires: %{python_module trustme >= 0.5.3} BuildRequires: %{python_module urllib3 >= %{version}} -%if "%{python_flavor}" == "python2" -BuildRequires: %{python_module mock} -%endif %endif %python_subpackages