- Fix dbus-python deps to ease the logic and allow python2less build

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SecretStorage?expand=0&rev=15
This commit is contained in:
Tomáš Chvátal 2018-01-24 10:18:26 +00:00 committed by Git OBS Bridge
parent 7777b4a722
commit 0450290bda
2 changed files with 11 additions and 19 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 24 10:17:37 UTC 2018 - tchvatal@suse.com
- Fix dbus-python deps to ease the logic and allow python2less build
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 1 19:13:10 UTC 2017 - toddrme2178@gmail.com Mon May 1 19:13:10 UTC 2017 - toddrme2178@gmail.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package python-SecretStorage # spec file for package python-SecretStorage
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,8 +16,6 @@
# #
%bcond_without tests
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-SecretStorage Name: python-SecretStorage
Version: 2.3.1 Version: 2.3.1
@ -27,26 +25,16 @@ License: BSD-3-Clause
Group: Development/Languages/Python Group: Development/Languages/Python
Url: https://github.com/mitya57/secretstorage Url: https://github.com/mitya57/secretstorage
Source: https://files.pythonhosted.org/packages/source/S/SecretStorage/SecretStorage-%{version}.tar.gz Source: https://files.pythonhosted.org/packages/source/S/SecretStorage/SecretStorage-%{version}.tar.gz
BuildRequires: fdupes BuildRequires: %{python_module cryptography}
BuildRequires: python-rpm-macros BuildRequires: %{python_module dbus-python}
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module cryptography}
BuildRequires: dbus-1-python
BuildRequires: dbus-1-python3
# Testing requirements
%if %{with tests}
BuildRequires: dbus-1-x11 BuildRequires: dbus-1-x11
BuildRequires: fdupes
BuildRequires: gnome-keyring BuildRequires: gnome-keyring
%endif BuildRequires: python-rpm-macros
Requires: python-cryptography Requires: python-cryptography
%ifpython2 Requires: python-dbus-python
Requires: dbus-1-python
%endif
%ifpython2
Requires: dbus-1-python3
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages
@ -85,7 +73,6 @@ mkdir -p $HOME/.cache
%python_expand dbus-run-session -- $python -m unittest discover -s tests %python_expand dbus-run-session -- $python -m unittest discover -s tests
%files %{python_files} %files %{python_files}
%defattr(-,root,root,-)
%doc changelog README.rst LICENSE %doc changelog README.rst LICENSE
%{python_sitelib}/* %{python_sitelib}/*