From 2a6ad6cf77913023dc6cfff3cb72f81121ac9038062cb2b85ec6a0750dab87d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 13 May 2020 11:43:25 +0000 Subject: [PATCH] Accepting request 805260 from home:alarrosa:branches:devel:languages:python - Relax the setuptools dependency on 40.8.0 to 40.5.0 since that version is only required by upstream because of a pip issue (see https://github.com/pyca/bcrypt/commit/bc8a55e70e179a59fa89fb109353182f8f438e00). This way we can build in SLE 15 SP2 / Leap 15.2 . OBS-URL: https://build.opensuse.org/request/show/805260 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bcrypt?expand=0&rev=21 --- python-bcrypt.changes | 8 ++++++++ python-bcrypt.spec | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/python-bcrypt.changes b/python-bcrypt.changes index 2e8be59..833921e 100644 --- a/python-bcrypt.changes +++ b/python-bcrypt.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 13 11:20:23 UTC 2020 - Antonio Larrosa + +- Relax the setuptools dependency on 40.8.0 to 40.5.0 since that + version is only required by upstream because of a pip issue + (see https://github.com/pyca/bcrypt/commit/bc8a55e70e179a59fa89fb109353182f8f438e00). + This way we can build in SLE 15 SP2 / Leap 15.2 . + ------------------------------------------------------------------- Sun Jul 28 16:11:38 UTC 2019 - Arun Persaud diff --git a/python-bcrypt.spec b/python-bcrypt.spec index 9f1e53a..80a9356 100644 --- a/python-bcrypt.spec +++ b/python-bcrypt.spec @@ -1,7 +1,7 @@ # # spec file for package python-bcrypt # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2016, Martin Hauke # # All modifications and additions to the file contributed by third parties @@ -30,7 +30,9 @@ Source: https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-% BuildRequires: %{python_module cffi >= 1.1} BuildRequires: %{python_module devel} BuildRequires: %{python_module pytest >= 3.2.1} -BuildRequires: %{python_module setuptools >= 40.8.0} +# setuptools 40.8.0 is required by upstream only for a pip issue that doesn't +# affect us, so we relax the requirement to build in SLE/Leap 15.2 with 40.5.0 +BuildRequires: %{python_module setuptools >= 40.5.0} BuildRequires: %{python_module six >= 1.4.1} BuildRequires: fdupes BuildRequires: pkgconfig