From 5d5ef4e56edac28e9de759a232c96dfb85e248b7fe0870a63f0c0c58d4f44635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 19 Feb 2019 10:47:08 +0000 Subject: [PATCH] - Conflict with pymacaroons-pynacl OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pymacaroons?expand=0&rev=2 --- python-pymacaroons.changes | 5 +++++ python-pymacaroons.spec | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/python-pymacaroons.changes b/python-pymacaroons.changes index 48674c0..425c672 100644 --- a/python-pymacaroons.changes +++ b/python-pymacaroons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 19 10:46:51 UTC 2019 - Tomáš Chvátal + +- Conflict with pymacaroons-pynacl + ------------------------------------------------------------------- Wed Feb 6 16:52:14 UTC 2019 - ecsos@opensuse.org diff --git a/python-pymacaroons.spec b/python-pymacaroons.spec index 0594535..baed7b8 100644 --- a/python-pymacaroons.spec +++ b/python-pymacaroons.spec @@ -12,7 +12,7 @@ # 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/ # @@ -26,26 +26,27 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/ecordell/pymacaroons Source: https://github.com/ecordell/pymacaroons/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: %{python_module PyNaCl >= 1.1.2} BuildRequires: %{python_module PyNaCl < 2.0} +BuildRequires: %{python_module PyNaCl >= 1.1.2} #BuildRequires: %%{python_module bumpversion} -BuildRequires: %{python_module python-coveralls >= 2.4.2} +BuildRequires: %{python_module Sphinx >= 1.2.3} BuildRequires: %{python_module cffi} BuildRequires: %{python_module coverage} BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module mock} BuildRequires: %{python_module nose} +BuildRequires: %{python_module python-coveralls >= 2.4.2} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module Sphinx >= 1.2.3} BuildRequires: %{python_module six >= 1.8.0} BuildRequires: python-tox ##BuildRequires: %%{python_module yanc} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-PyNaCl >= 1.1.2 Requires: python-PyNaCl < 2.0 +Requires: python-PyNaCl >= 1.1.2 Requires: python-cffi Requires: python-six >= 1.8.0 +Conflicts: python-pymacaroons-pynacl BuildArch: noarch %python_subpackages