From 399eb61194a08688030e6a1054b2a591f05091fb2ac92b7eac7e185621774866 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 7 Nov 2018 12:58:34 +0000 Subject: [PATCH 1/2] - Fix build for openSUSE Leap 42.3 + urllib3 needs the ssl module, which in Leap 42.3 is delivered by python and not python-base. Set explicit build dependency on python OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-botocore?expand=0&rev=21 --- python-botocore.changes | 7 +++++++ python-botocore.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/python-botocore.changes b/python-botocore.changes index 4e4a737..a075637 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 7 12:56:44 UTC 2018 - Robert Schweikert + +- Fix build for openSUSE Leap 42.3 + + urllib3 needs the ssl module, which in Leap 42.3 is delivered by python + and not python-base. Set explicit build dependency on python + ------------------------------------------------------------------- Tue Nov 6 14:15:47 UTC 2018 - John Paul Adrian Glaubitz diff --git a/python-botocore.spec b/python-botocore.spec index f59bdfc..3831a9d 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -36,6 +36,10 @@ BuildRequires: %{python_module urllib3 < 1.25} BuildRequires: %{python_module urllib3 >= 1.20} BuildRequires: fdupes BuildRequires: python-rpm-macros +%if 0%{?suse_version} <= 1315 +# We need the ssl module, which is delivers by python and not python-base +BuildRequires: python +%endif Requires: python-docutils >= 0.10 Requires: python-jmespath < 1.0.0 Requires: python-jmespath >= 0.7.1 From ab452ef4bc5c6848d6b8618b237a43342b5f5b7fb859d684de45de629c821ed7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Nov 2018 10:28:01 +0000 Subject: [PATCH 2/2] rebase OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-botocore?expand=0&rev=22 --- python-botocore.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python-botocore.spec b/python-botocore.spec index 3831a9d..680b827 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -23,7 +23,7 @@ Release: 0 Summary: Python interface for AWS License: Apache-2.0 Group: Development/Languages/Python -Url: https://github.com/boto/botocore +URL: https://github.com/boto/botocore Source: https://files.pythonhosted.org/packages/source/b/botocore/botocore-%{version}.tar.gz Patch0: hide_py_pckgmgmt.patch BuildRequires: %{python_module docutils >= 0.10} @@ -36,10 +36,6 @@ BuildRequires: %{python_module urllib3 < 1.25} BuildRequires: %{python_module urllib3 >= 1.20} BuildRequires: fdupes BuildRequires: python-rpm-macros -%if 0%{?suse_version} <= 1315 -# We need the ssl module, which is delivers by python and not python-base -BuildRequires: python -%endif Requires: python-docutils >= 0.10 Requires: python-jmespath < 1.0.0 Requires: python-jmespath >= 0.7.1 @@ -48,6 +44,10 @@ Requires: python-python-dateutil >= 2.1 Requires: python-requests Requires: python-six BuildArch: noarch +%if 0%{?suse_version} <= 1315 +# We need the ssl module, which is delivers by python and not python-base +BuildRequires: python +%endif # SECTION Testing requirements BuildRequires: %{python_module mock} BuildRequires: %{python_module nose}