From 0450290bdac5130e6667d44db5c8a339ce206b1db083e2facfc5f6b43bbbb954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 24 Jan 2018 10:18:26 +0000 Subject: [PATCH] - 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 --- python-SecretStorage.changes | 5 +++++ python-SecretStorage.spec | 25 ++++++------------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/python-SecretStorage.changes b/python-SecretStorage.changes index d31319f..9267c82 100644 --- a/python-SecretStorage.changes +++ b/python-SecretStorage.changes @@ -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 diff --git a/python-SecretStorage.spec b/python-SecretStorage.spec index f4f9660..4d5071d 100644 --- a/python-SecretStorage.spec +++ b/python-SecretStorage.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,6 @@ # -%bcond_without tests - %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-SecretStorage Version: 2.3.1 @@ -27,26 +25,16 @@ License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/mitya57/secretstorage Source: https://files.pythonhosted.org/packages/source/S/SecretStorage/SecretStorage-%{version}.tar.gz -BuildRequires: fdupes -BuildRequires: python-rpm-macros +BuildRequires: %{python_module cryptography} +BuildRequires: %{python_module dbus-python} BuildRequires: %{python_module devel} 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: fdupes BuildRequires: gnome-keyring -%endif +BuildRequires: python-rpm-macros Requires: python-cryptography -%ifpython2 -Requires: dbus-1-python -%endif -%ifpython2 -Requires: dbus-1-python3 -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: python-dbus-python BuildArch: noarch %python_subpackages @@ -85,7 +73,6 @@ mkdir -p $HOME/.cache %python_expand dbus-run-session -- $python -m unittest discover -s tests %files %{python_files} -%defattr(-,root,root,-) %doc changelog README.rst LICENSE %{python_sitelib}/*