From bb3499274eb58d7c558e625c13cce322640ea6c412f6d7db19c31754d4b50558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Fri, 11 Dec 2020 12:06:51 +0000 Subject: [PATCH 1/2] Accepting request 854859 from home:gladiac:pgadmin4 - Add missing BR for unittest2 This fixes building on openSUSE_Leap_15.2 OBS-URL: https://build.opensuse.org/request/show/854859 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=126 --- python-psutil.changes | 5 +++++ python-psutil.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-psutil.changes b/python-psutil.changes index 0be88d7..b1a12d8 100644 --- a/python-psutil.changes +++ b/python-psutil.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 11 11:36:23 UTC 2020 - Andreas Schneider + +- Add missing BR for unittest2 + ------------------------------------------------------------------- Tue Dec 1 12:55:06 UTC 2020 - Dirk Mueller diff --git a/python-psutil.spec b/python-psutil.spec index d351076..f8339d2 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -41,6 +41,7 @@ BuildRequires: python-rpm-macros Requires: net-tools Requires: procps %if %{with test} +BuildRequires: %{python_module unittest2} BuildRequires: net-tools BuildRequires: procps %if %{with python2} From 2adad0d40ba362c633c509511fffe70df1bf2eb3af16be09b912e73da5946b9e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 11 Dec 2020 13:29:08 +0000 Subject: [PATCH 2/2] Accepting request 854880 from home:bnavigator:branches:devel:languages:python - Only require unittest2 for Leap. OBS-URL: https://build.opensuse.org/request/show/854880 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=127 --- python-psutil.changes | 5 +++++ python-psutil.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/python-psutil.changes b/python-psutil.changes index b1a12d8..7f091d8 100644 --- a/python-psutil.changes +++ b/python-psutil.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 11 12:19:05 UTC 2020 - Benjamin Greiner + +- Only require unittest2 for Leap. + ------------------------------------------------------------------- Fri Dec 11 11:36:23 UTC 2020 - Andreas Schneider diff --git a/python-psutil.spec b/python-psutil.spec index f8339d2..ae283b6 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -41,7 +41,9 @@ BuildRequires: python-rpm-macros Requires: net-tools Requires: procps %if %{with test} +%if 0%{suse_version} < 1550 BuildRequires: %{python_module unittest2} +%endif BuildRequires: net-tools BuildRequires: procps %if %{with python2}