From 7b6dc9bf1a6f02ec0f3c087610428cba242b5402923da0b60e42ae110e66e321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 9 Jan 2019 08:17:54 +0000 Subject: [PATCH 1/2] Accepting request 663869 from home:jbrownell:branches:devel:languages:python - Use "Requires:" instead of "Recommends:" on older Red Hat platforms OBS-URL: https://build.opensuse.org/request/show/663869 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=44 --- python-gevent.changes | 5 +++++ python-gevent.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/python-gevent.changes b/python-gevent.changes index 026d3a7..7d50fd5 100644 --- a/python-gevent.changes +++ b/python-gevent.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 9 00:10:41 UTC 2019 - Jonathan Brownell + +- Use "Requires:" instead of "Recommends:" on older Red Hat platforms + ------------------------------------------------------------------- Tue Aug 7 15:22:15 UTC 2018 - toddrme2178@gmail.com diff --git a/python-gevent.spec b/python-gevent.spec index 03b9a26..600a156 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -1,7 +1,7 @@ # # spec file for package python-gevent # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -40,7 +40,11 @@ BuildRequires: %{python_module nose} %endif Requires: python-cffi Requires: python-greenlet +%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 || 0%{?rhel} >= 8 +Requires: python-psutil +%else Recommends: python-psutil +%endif %python_subpackages From e80cbd7b3b5df82d80c748a4d580937f30528c4662b8ece9135ee89037a15fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 9 Jan 2019 08:27:01 +0000 Subject: [PATCH 2/2] - Switch the condition logic to match the previous changelog OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gevent?expand=0&rev=45 --- python-gevent.changes | 5 +++++ python-gevent.spec | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/python-gevent.changes b/python-gevent.changes index 7d50fd5..e4ac7f4 100644 --- a/python-gevent.changes +++ b/python-gevent.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 9 08:26:33 UTC 2019 - Tomáš Chvátal + +- Switch the condition logic to match the previous changelog + ------------------------------------------------------------------- Wed Jan 9 00:10:41 UTC 2019 - Jonathan Brownell diff --git a/python-gevent.spec b/python-gevent.spec index 600a156..7d36805 100644 --- a/python-gevent.spec +++ b/python-gevent.spec @@ -12,21 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} # Tests require network connection %bcond_with tests - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-gevent Version: 1.3.5 Release: 0 Summary: Python network library that uses greenlet and libevent License: MIT Group: Development/Languages/Python -Url: http://www.gevent.org/ +URL: http://www.gevent.org/ Source: https://files.pythonhosted.org/packages/source/g/gevent/gevent-%{version}.tar.gz Source100: %{name}-rpmlintrc BuildRequires: %{python_module cffi} @@ -35,17 +34,16 @@ BuildRequires: %{python_module greenlet} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-cffi +Requires: python-greenlet %if %{with tests} BuildRequires: %{python_module nose} %endif -Requires: python-cffi -Requires: python-greenlet -%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 || 0%{?rhel} >= 8 -Requires: python-psutil -%else +%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel} >= 8 Recommends: python-psutil +%else +Requires: python-psutil %endif - %python_subpackages %description