From 6f88b044ac10ce14108d28e18afd45608cfa59780a7494f0e32b8f066589f230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 20 Apr 2020 10:42:08 +0000 Subject: [PATCH] - Fix build without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyftpdlib?expand=0&rev=21 --- python-pyftpdlib.changes | 5 +++++ python-pyftpdlib.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python-pyftpdlib.changes b/python-pyftpdlib.changes index 6a303b6..3e5864c 100644 --- a/python-pyftpdlib.changes +++ b/python-pyftpdlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 20 10:41:55 UTC 2020 - Tomáš Chvátal + +- Fix build without python2 + ------------------------------------------------------------------- Fri Mar 27 08:46:37 UTC 2020 - Antonio Larrosa diff --git a/python-pyftpdlib.spec b/python-pyftpdlib.spec index c998696..78f0fa0 100644 --- a/python-pyftpdlib.spec +++ b/python-pyftpdlib.spec @@ -20,6 +20,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} # Tests randomly fail: https://github.com/giampaolo/pyftpdlib/issues/386 %bcond_with test +%bcond_without python2 Name: python-pyftpdlib Version: 1.5.6 Release: 0 @@ -34,15 +35,17 @@ BuildRequires: %{python_module pyOpenSSL} BuildRequires: %{python_module pysendfile} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: python-ipaddress -BuildRequires: python-mock BuildRequires: python-rpm-macros Requires: python-pyOpenSSL Recommends: python-pysendfile +BuildArch: noarch +%if %{with python2} +BuildRequires: python-ipaddress +BuildRequires: python-mock +%endif %ifpython2 Requires: python-ipaddress %endif -BuildArch: noarch %python_subpackages %description