diff --git a/python-ptr.changes b/python-ptr.changes index e8cec54..4cd2099 100644 --- a/python-ptr.changes +++ b/python-ptr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 2 07:38:00 UTC 2020 - Tomáš Chvátal + +- Conflict with pytest-runner as we provide same file on the disk + ------------------------------------------------------------------- Mon Dec 9 09:44:09 UTC 2019 - John Vandenberg diff --git a/python-ptr.spec b/python-ptr.spec index 3d78de6..9888044 100644 --- a/python-ptr.spec +++ b/python-ptr.spec @@ -1,7 +1,7 @@ # # spec file for package python-ptr # -# 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 @@ -12,7 +12,8 @@ # 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-%{**}} @@ -20,17 +21,17 @@ Name: python-ptr Version: 19.11.21 Release: 0 -License: MIT Summary: Parallel asyncio Python setup(cfg|py) test runner -Url: http://github.com/facebookincubator/ptr -Group: Development/Languages/Python +License: MIT +URL: https://github.com/facebookincubator/ptr Source: https://files.pythonhosted.org/packages/source/p/ptr/ptr-%{version}.tar.gz -BuildRequires: python-rpm-macros BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes +BuildRequires: python-rpm-macros +# Conflicts on site-packages/ptr.py +Conflicts: python-pytest-runner BuildArch: noarch - %python_subpackages %description