From 2c961879bae7fd65b813df11da064c192159fda089122d4c3cdc513078346503 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 22 Apr 2020 05:13:34 +0000 Subject: [PATCH 1/3] Drop BuildRequires on mock and funcsigs, and update Requires/Recommends to python3. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Beaker?expand=0&rev=45 --- python-Beaker.changes | 6 ++++++ python-Beaker.spec | 22 ++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/python-Beaker.changes b/python-Beaker.changes index db11b00..2078ac0 100644 --- a/python-Beaker.changes +++ b/python-Beaker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 22 05:09:37 UTC 2020 - Steve Kowalik + +- Drop BuildRequires on mock and funcsigs, and update Requires/Recommends + to python3. + ------------------------------------------------------------------- Sat Nov 23 13:35:32 UTC 2019 - Michael Ströder diff --git a/python-Beaker.spec b/python-Beaker.spec index cbcf901..6efcaa4 100644 --- a/python-Beaker.spec +++ b/python-Beaker.spec @@ -1,7 +1,7 @@ # # spec file for package python-Beaker # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,6 @@ BuildRequires: %{python_module SQLAlchemy} BuildRequires: %{python_module WebTest} BuildRequires: %{python_module coverage} BuildRequires: %{python_module cryptography} -BuildRequires: %{python_module mock} BuildRequires: %{python_module nose} BuildRequires: %{python_module pycryptodome} BuildRequires: %{python_module pylibmc} @@ -39,18 +38,17 @@ BuildRequires: %{python_module python-memcached} BuildRequires: %{python_module redis} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: python-funcsigs BuildRequires: python-rpm-macros BuildRequires: python3-dbm -Requires: python-pylibmc -Requires: python-setuptools -Recommends: python-SQLAlchemy -Recommends: python-cryptography -Recommends: python-python-memcached -Recommends: python-pycrypto -Recommends: python-pycryptopp >= 0.5.12 -Recommends: python-pymongo -Recommends: python-redis +Requires: python3-pylibmc +Requires: python3-setuptools +Recommends: python3-SQLAlchemy +Recommends: python3-cryptography +Recommends: python3-python-memcached +Recommends: python3-pycrypto +Recommends: python3-pycryptopp >= 0.5.12 +Recommends: python3-pymongo +Recommends: python3-redis BuildArch: noarch %ifpython3 Requires: python3-dbm From 7c62141a36ca0b0424c31f87afd17fb98e557c2cbb1e4b0786eecf2a5ae77f5b Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 22 Apr 2020 07:05:11 +0000 Subject: [PATCH 2/3] - Fix build without Python 2 present. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Beaker?expand=0&rev=46 --- python-Beaker.changes | 6 ++---- python-Beaker.spec | 37 ++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/python-Beaker.changes b/python-Beaker.changes index 2078ac0..41cd9b2 100644 --- a/python-Beaker.changes +++ b/python-Beaker.changes @@ -1,8 +1,6 @@ -------------------------------------------------------------------- -Wed Apr 22 05:09:37 UTC 2020 - Steve Kowalik +Wed Apr 22 06:59:17 UTC 2020 - Steve Kowalik -- Drop BuildRequires on mock and funcsigs, and update Requires/Recommends - to python3. +- Fix build without Python 2 present. ------------------------------------------------------------------- Sat Nov 23 13:35:32 UTC 2019 - Michael Ströder diff --git a/python-Beaker.spec b/python-Beaker.spec index 6efcaa4..da85057 100644 --- a/python-Beaker.spec +++ b/python-Beaker.spec @@ -17,19 +17,20 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python +%bcond_without python2 Name: python-Beaker Version: 1.11.0 Release: 0 Summary: A Session and Caching library with WSGI Middleware License: BSD-3-Clause -Group: Development/Languages/Python URL: https://github.com/bbangert/beaker Source: https://github.com/bbangert/beaker/archive/%{version}.tar.gz BuildRequires: %{python_module SQLAlchemy} BuildRequires: %{python_module WebTest} BuildRequires: %{python_module coverage} BuildRequires: %{python_module cryptography} +BuildRequires: %{python_module dbm} +BuildRequires: %{python_module mock} BuildRequires: %{python_module nose} BuildRequires: %{python_module pycryptodome} BuildRequires: %{python_module pylibmc} @@ -39,24 +40,26 @@ BuildRequires: %{python_module redis} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: python3-dbm -Requires: python3-pylibmc -Requires: python3-setuptools -Recommends: python3-SQLAlchemy -Recommends: python3-cryptography -Recommends: python3-python-memcached -Recommends: python3-pycrypto -Recommends: python3-pycryptopp >= 0.5.12 -Recommends: python3-pymongo -Recommends: python3-redis -BuildArch: noarch -%ifpython3 -Requires: python3-dbm +%if %{with python2} +BuildRequires: python-funcsigs %endif %ifpython2 +Requires: python-pylibmc +Requires: python-setuptools +Recommends: python-SQLAlchemy +Recommends: python-cryptography +Recommends: python-python-memcached +Recommends: python-pycrypto +Recommends: python-pycryptopp >= 0.5.12 +Recommends: python-pymongo +Recommends: python-redis +BuildArch: noarch Requires: python-funcsigs -Provides: %{oldpython}-beaker = %{version} -Obsoletes: %{oldpython}-beaker < %{version} +Provides: python-beaker = %{version} +Obsoletes: python-beaker < %{version} +%endif +%ifpython3 +Requires: python3-dbm %endif %python_subpackages From a6c85904562695e9bf6de57cf9abc8fbeb193bdb8b498cb5e57207080f9d1051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 22 Apr 2020 07:13:15 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Beaker?expand=0&rev=47 --- python-Beaker.changes | 1 + python-Beaker.spec | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/python-Beaker.changes b/python-Beaker.changes index 41cd9b2..bbb6197 100644 --- a/python-Beaker.changes +++ b/python-Beaker.changes @@ -1,3 +1,4 @@ +------------------------------------------------------------------- Wed Apr 22 06:59:17 UTC 2020 - Steve Kowalik - Fix build without Python 2 present. diff --git a/python-Beaker.spec b/python-Beaker.spec index da85057..a60ab64 100644 --- a/python-Beaker.spec +++ b/python-Beaker.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python %bcond_without python2 Name: python-Beaker Version: 1.11.0 @@ -40,23 +41,23 @@ BuildRequires: %{python_module redis} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -%if %{with python2} -BuildRequires: python-funcsigs -%endif -%ifpython2 Requires: python-pylibmc Requires: python-setuptools Recommends: python-SQLAlchemy Recommends: python-cryptography -Recommends: python-python-memcached Recommends: python-pycrypto Recommends: python-pycryptopp >= 0.5.12 Recommends: python-pymongo +Recommends: python-python-memcached Recommends: python-redis BuildArch: noarch +%if %{with python2} +BuildRequires: python-funcsigs +%endif +%ifpython2 Requires: python-funcsigs -Provides: python-beaker = %{version} -Obsoletes: python-beaker < %{version} +Provides: %{oldpython}-beaker = %{version} +Obsoletes: %{oldpython}-beaker < %{version} %endif %ifpython3 Requires: python3-dbm