From 1247936292baef732cddaeeace70f66d0e6bdff1925302e3f25d3d4d1c4823ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 9 Dec 2020 11:58:26 +0000 Subject: [PATCH] Accepting request 854221 from home:bnavigator:branches:devel:languages:python - Support TW with multiple python3 flavors * gh#openSUSE/python-rpm-macros#66 * fix BuildRequires * fix %python_expand $python executable replacement OBS-URL: https://build.opensuse.org/request/show/854221 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-mock?expand=0&rev=41 --- python-requests-mock.changes | 8 ++++++++ python-requests-mock.spec | 14 +++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/python-requests-mock.changes b/python-requests-mock.changes index be2e1f4..76e1d38 100644 --- a/python-requests-mock.changes +++ b/python-requests-mock.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 9 10:26:01 UTC 2020 - Benjamin Greiner + +- Support TW with multiple python3 flavors + * gh#openSUSE/python-rpm-macros#66 + * fix BuildRequires + * fix %python_expand $python executable replacement + ------------------------------------------------------------------- Sun Jun 14 09:11:15 UTC 2020 - Dirk Mueller diff --git a/python-requests-mock.spec b/python-requests-mock.spec index 3755036..eee1933 100644 --- a/python-requests-mock.spec +++ b/python-requests-mock.spec @@ -32,17 +32,21 @@ BuildRequires: %{python_module purl} BuildRequires: %{python_module purl} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests >= 2.3} -BuildRequires: %{python_module rpm-macros} BuildRequires: %{python_module six} BuildRequires: %{python_module testrepository >= 0.0.18} BuildRequires: %{python_module testtools} +BuildRequires: python-rpm-macros +%if 0%{suse_version} >= 1550 +BuildRequires: %{python_module dbm} +%else +BuildRequires: python3-dbm +%endif BuildRequires: fdupes Requires: python-requests >= 2.3 Requires: python-six BuildArch: noarch -%ifpython3 -BuildRequires: python3-dbm -Requires: python3-dbm +%if "%python_flavor" != "python2" +Requires: python-dbm %endif %python_subpackages @@ -66,7 +70,7 @@ You should checkout the docs for more information. mv .testr.conf .testr.conf.orig %{python_expand # first line can't be empty rm -rf .testrepository -sed 's/python/$python/' .testr.conf.orig >| .testr.conf +sed 's/python /$python /' .testr.conf.orig >| .testr.conf testr init testr run --parallel }