From eaf21f0342d6108d2624b4bf749f79cad0dc85c157df1e0a01dac268f49ace0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 12 Mar 2020 07:48:06 +0000 Subject: [PATCH] - Fix buid without python2 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockify?expand=0&rev=40 --- python-websockify.changes | 5 +++++ python-websockify.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/python-websockify.changes b/python-websockify.changes index da8c2c6..afeb2b0 100644 --- a/python-websockify.changes +++ b/python-websockify.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 12 07:47:53 UTC 2020 - Tomáš Chvátal + +- Fix buid without python2 + ------------------------------------------------------------------- Mon Aug 19 08:56:31 UTC 2019 - Tomáš Chvátal diff --git a/python-websockify.spec b/python-websockify.spec index 424ee06..f1b8618 100644 --- a/python-websockify.spec +++ b/python-websockify.spec @@ -1,7 +1,7 @@ # # spec file for package python-websockify # -# 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 @@ -17,12 +17,12 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-websockify Version: 0.9.0 Release: 0 Summary: WebSocket to TCP proxy/bridge License: LGPL-3.0-only AND MPL-2.0 AND BSD-2-Clause AND BSD-3-Clause -Group: Development/Languages/Python URL: https://github.com/novnc/websockify Source: https://github.com/novnc/websockify/archive/v%{version}.tar.gz BuildRequires: %{python_module cryptography} @@ -34,13 +34,15 @@ BuildRequires: %{python_module redis} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module simplejson} BuildRequires: fdupes -BuildRequires: python-enum34 BuildRequires: python-rpm-macros Requires: python-numpy Requires: python-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch +%if %{with python2} +BuildRequires: python-enum34 +%endif %if 0%{?suse_version} Recommends: python-jwcrypto Recommends: python-redis @@ -59,7 +61,6 @@ the target in both directions. %package -n python-websockify-common Summary: Common data files for the Websockify TCP proxy/bridge -Group: Development/Languages/Python Provides: %{python_module websockify-common = %{version}} %description -n python-websockify-common