From 3310dfa7db8573c2807c82d13ab8e022cb2996d90d6eb50276cdd9473a7206cb Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 20 Feb 2020 06:36:04 +0000 Subject: [PATCH] - Remove python-tornado Conflicts, {Build,}Require tornado4 directly. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-httpdomain?expand=0&rev=36 --- python-sphinxcontrib-httpdomain.changes | 5 +++++ python-sphinxcontrib-httpdomain.spec | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/python-sphinxcontrib-httpdomain.changes b/python-sphinxcontrib-httpdomain.changes index b1d1a18..661117a 100644 --- a/python-sphinxcontrib-httpdomain.changes +++ b/python-sphinxcontrib-httpdomain.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 20 06:34:35 UTC 2020 - Steve Kowalik + +- Remove python-tornado Conflicts, {Build,}Require tornado4 directly. + ------------------------------------------------------------------- Mon Aug 26 16:57:00 UTC 2019 - Todd R diff --git a/python-sphinxcontrib-httpdomain.spec b/python-sphinxcontrib-httpdomain.spec index 46295d2..69bc9e1 100644 --- a/python-sphinxcontrib-httpdomain.spec +++ b/python-sphinxcontrib-httpdomain.spec @@ -1,7 +1,7 @@ # # spec file for package python-sphinxcontrib-httpdomain # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,14 +31,12 @@ BuildRequires: %{python_module bottle >= 0.11.0} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} -BuildRequires: %{python_module tornado >= 4.5} -BuildConflicts: %{python_module tornado >= 5} +BuildRequires: %{python_module tornado4} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Sphinx >= 1.5 Requires: python-six -Requires: python-tornado >= 4.5 -Conflicts: python-tornado >= 5 +Requires: python-tornado4 BuildArch: noarch %python_subpackages