From bbe6fa4376cc032c5c648612ba0a8483e0bc7a8673834015019cecb72573ce1e Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Fri, 23 Jun 2017 16:18:10 +0000 Subject: [PATCH] Accepting request 505937 from home:matejcik:rpm-macros-build-test - replace the complicated condition for requiring backports.ssl_match_hostname with unconditional requirement for Python >= 2.7.9 OBS-URL: https://build.opensuse.org/request/show/505937 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tornado?expand=0&rev=57 --- python-tornado.changes | 6 ++++++ python-tornado.spec | 49 ++++++++++-------------------------------- 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/python-tornado.changes b/python-tornado.changes index 000129a..8a2a131 100644 --- a/python-tornado.changes +++ b/python-tornado.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 13 14:57:15 UTC 2017 - jmatejek@suse.com + +- replace the complicated condition for requiring backports.ssl_match_hostname + with unconditional requirement for Python >= 2.7.9 + ------------------------------------------------------------------- Wed May 31 19:25:46 UTC 2017 - dmueller@suse.com diff --git a/python-tornado.spec b/python-tornado.spec index bcf2a2b..b2471e3 100644 --- a/python-tornado.spec +++ b/python-tornado.spec @@ -20,65 +20,38 @@ Name: python-tornado Version: 4.4.3 Release: 0 -Url: http://www.tornadoweb.org Summary: Open source version of scalable, non-blocking web server that power FriendFeed License: Apache-2.0 Group: Development/Languages/Python +Url: http://www.tornadoweb.org Source: https://files.pythonhosted.org/packages/source/t/tornado/tornado-%{version}.tar.gz Patch0: tornado-configtest.patch Patch1: tornado-async-deprecations.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module pycurl} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module simplejson} +BuildRequires: fdupes +BuildRequires: python-futures +BuildRequires: python-rpm-macros +Requires: python >= 2.7.9 +Requires: python-simplejson +Recommends: python-Twisted +Recommends: python-pycares +Recommends: python-pycurl +Recommends: python-service_identity +BuildRoot: %{_tmppath}/%{name}-%{version}-build # SECTION test requirements BuildRequires: %{python_module backports_abc} BuildRequires: python-singledispatch # /SECTION -BuildRequires: fdupes -BuildRequires: python-futures -BuildRequires: python-rpm-macros - -# Tornado requires python-certifi when the ssl module -# does not provide the 'create_default_context' function. -# The ssl module is part of the python package. -# Starting from python 2.7.9 the ssl module satisfies -# tornado's requirement, making the python-certifi package -# optional. -# Python 2.7.9 is availalbe on SLE12 Updates channel and is going -# to be available also on openSUSE leap. -%if 0%{?sles_version} >= 12 || 0%{?suse_version} > 1320 -Requires: python >= 2.7.9 -%else -BuildRequires: %{python_module certifi} -%ifpython2 -BuildRequires: python-backports.ssl_match_hostname -Requires: python-backports.ssl_match_hostname -%endif -Requires: python-certifi -%endif - %if %python_version_nodots < 35 Requires: python-backports_abc %endif - -# Python 2 specific backports %ifpython2 Requires: python-singledispatch Recommends: python-futures %endif -# end python 2 specific - -Requires: python-simplejson - -Recommends: python-pycares -Recommends: python-pycurl -Recommends: python-Twisted -Recommends: python-service_identity - -BuildRequires: fdupes - %python_subpackages %description