diff --git a/python-bcrypt.changes b/python-bcrypt.changes index f66fd8f..1a716ee 100644 --- a/python-bcrypt.changes +++ b/python-bcrypt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 29 10:30:02 UTC 2018 - tchvatal@suse.com + +- Raise pytest requirement based on setup.py + ------------------------------------------------------------------- Wed Oct 25 19:52:50 UTC 2017 - arun@gmx.de diff --git a/python-bcrypt.spec b/python-bcrypt.spec index b0e22e0..fcf9ae8 100644 --- a/python-bcrypt.spec +++ b/python-bcrypt.spec @@ -1,7 +1,7 @@ # # spec file for package python-bcrypt # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016, Martin Hauke # # All modifications and additions to the file contributed by third parties @@ -17,8 +17,6 @@ # -%bcond_without tests - %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-bcrypt @@ -27,30 +25,26 @@ Release: 0 Summary: BSD type 2a and 2b password hashing License: Apache-2.0 Group: Development/Languages/Python -Url: https://github.com/pyca/bcrypt/ +URL: https://github.com/pyca/bcrypt/ Source: https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz BuildRequires: %{python_module cffi} BuildRequires: %{python_module devel} +BuildRequires: %{python_module pytest >= 3.2.1} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: fdupes +BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: pkgconfig(libffi) -%if %{with tests} -BuildRequires: %{python_module pytest} -%endif Requires: python-six %requires_eq python-cffi +Provides: python-py-bcrypt = %{version} +Obsoletes: python-py-bcrypt < %{version} # This is intended as a drop-in replacement for py-bcrypt %ifpython2 Provides: %{oldpython}-py-bcrypt = %{version} Obsoletes: %{oldpython}-py-bcrypt < %{version} %endif -%ifpython3 -Provides: python3-py-bcrypt = %{version} -Obsoletes: python3-py-bcrypt < %{version} -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %python_subpackages %description @@ -62,20 +56,18 @@ using the BSD-originating hashing methods known as "2a" and "2b". %build export CFLAGS="%{optflags} -fno-strict-aliasing" -%python_build +%python_build %install %python_install %python_expand %fdupes %{buildroot}/%{$python_sitearch} -%if %{with tests} %check %python_exec setup.py test -%endif %files %{python_files} -%defattr(-,root,root,-) -%doc LICENSE README.rst +%license LICENSE +%doc README.rst %{python_sitearch}/bcrypt %{python_sitearch}/bcrypt-%{version}-py*.egg-info