From 78d3ad570b013d02c6225714e1f20258e8cfb2ae7201bc4da8c312622facd308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Mar 2020 06:36:19 +0000 Subject: [PATCH] - Fix build without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=21 --- python-ZEO.changes | 5 +++++ python-ZEO.spec | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/python-ZEO.changes b/python-ZEO.changes index b9ce326..8c8ba60 100644 --- a/python-ZEO.changes +++ b/python-ZEO.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 16 06:36:07 UTC 2020 - Tomáš Chvátal + +- Fix build without python2 + ------------------------------------------------------------------- Fri Mar 29 09:48:16 UTC 2019 - Tomáš Chvátal diff --git a/python-ZEO.spec b/python-ZEO.spec index 179132b..d6675b6 100644 --- a/python-ZEO.spec +++ b/python-ZEO.spec @@ -1,7 +1,7 @@ # # spec file for package python-ZEO # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -18,13 +18,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python +%bcond_without python2 Name: python-ZEO Version: 5.2.1 Release: 0 Summary: Client-Server storage implementation for ZODB License: ZPL-2.1 -Group: Development/Languages/Python URL: https://github.com/zopefoundation/ZEO Source: https://files.pythonhosted.org/packages/source/Z/ZEO/ZEO-%{version}.tar.gz Source99: %{name}-rpmlintrc @@ -44,9 +43,7 @@ BuildRequires: %{python_module zope.interface} BuildRequires: %{python_module zope.testing} BuildRequires: %{python_module zope.testrunner} BuildRequires: fdupes -BuildRequires: python-futures BuildRequires: python-rpm-macros -BuildRequires: python-trollius Requires: python-ZConfig Requires: python-ZODB >= 5.5.1 Requires: python-persistent >= 4.1.0 @@ -58,8 +55,12 @@ Requires: python-zope.interface Requires(post): update-alternatives Requires(preun): update-alternatives BuildArch: noarch +%if %{with python2} +BuildRequires: python-futures +BuildRequires: python-trollius +%endif %ifpython2 -Requires: %{oldpython}-trollius +Requires: python-trollius %endif %python_subpackages @@ -68,7 +69,6 @@ ZEO provides a client-server storage implementation for ZODB. %package -n %{name}-doc Summary: Client-Server storage implementation for ZODB -Group: Development/Languages/Python Provides: %{python_module ZEO-doc = %{version}} %description -n %{name}-doc