From 2a021588d7e155c5e48c805591f148373511cbd142efc272eaf5a4f703fe658f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 16 Jan 2018 10:27:31 +0000 Subject: [PATCH 1/2] - add missing dependency on python ssl OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cryptography?expand=0&rev=82 --- python-cryptography.changes | 5 +++++ python-cryptography.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-cryptography.changes b/python-cryptography.changes index d02e62b..133c1ed 100644 --- a/python-cryptography.changes +++ b/python-cryptography.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 16 10:14:37 UTC 2018 - dmueller@suse.com + +- add missing dependency on python ssl + ------------------------------------------------------------------- Fri Dec 8 18:04:13 UTC 2017 - arun@gmx.de diff --git a/python-cryptography.spec b/python-cryptography.spec index 2d768eb..c1060c4 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -1,7 +1,7 @@ # # spec file for package python-cryptography # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,6 +66,8 @@ BuildRequires: %{python_module pytest} BuildRequires: %{python_module virtualenv} # /SECTION %ifpython2 +# python-base is not enough, we need the _ssl module +Requires: python Requires: python-enum34 Requires: python-ipaddress %endif From cf6137bc31b610da7162dc35c74f2b67f0a321f445f24c7aaa94b602234995c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 18 Jan 2018 13:31:34 +0000 Subject: [PATCH 2/2] - Add proper conditional for the python2, the ifpython works only for the requires/etc OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cryptography?expand=0&rev=83 --- python-cryptography.changes | 6 ++++++ python-cryptography.spec | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/python-cryptography.changes b/python-cryptography.changes index 133c1ed..057c486 100644 --- a/python-cryptography.changes +++ b/python-cryptography.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 18 13:30:12 UTC 2018 - tchvatal@suse.com + +- Add proper conditional for the python2, the ifpython works only + for the requires/etc + ------------------------------------------------------------------- Tue Jan 16 10:14:37 UTC 2018 - dmueller@suse.com diff --git a/python-cryptography.spec b/python-cryptography.spec index c1060c4..7a66729 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-cryptography Version: 2.1.4 Release: 0 @@ -52,7 +53,7 @@ Requires: python-pyasn1 >= 0.1.8 Requires: python-setuptools >= 11.3 Requires: python-six >= 1.4.1 %requires_eq python-cffi -%ifpython2 +%if %{with python2} BuildRequires: python2-enum34 BuildRequires: python2-ipaddress %endif @@ -102,7 +103,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %fdupes %{buildroot}%{_prefix} %check -%if 0%{?suse_version} >= 1210 %{python_expand # this is going to be fun # create virtualenv $python %{_bindir}/virtualenv --system-site-packages TESTROOT-%{$python_bin_suffix} @@ -117,7 +117,6 @@ $python -m pytest tests # finish deactivate } -%endif %files %{python_files} %doc LICENSE LICENSE.APACHE LICENSE.BSD