diff --git a/optional-websockify.patch b/optional-websockify.patch new file mode 100644 index 0000000..ed732fe --- /dev/null +++ b/optional-websockify.patch @@ -0,0 +1,10 @@ +--- websockify-0.10.0/setup.py ++++ websockify-0.10.0/setup.py +@@ -29,7 +29,6 @@ + + packages=['websockify'], + include_package_data=True, +- install_requires=['numpy'], + zip_safe=False, + entry_points={ + 'console_scripts': [ diff --git a/python-websockify.changes b/python-websockify.changes index cc2ca75..6057bd2 100644 --- a/python-websockify.changes +++ b/python-websockify.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 7 11:54:41 UTC 2022 - Dirk Müller + +- add optional-websockify.patch to make dependency on numpy optional + ------------------------------------------------------------------- Mon Nov 8 19:53:48 UTC 2021 - Dirk Müller diff --git a/python-websockify.spec b/python-websockify.spec index 5ee6a85..a275a12 100644 --- a/python-websockify.spec +++ b/python-websockify.spec @@ -1,7 +1,7 @@ # # spec file for package python-websockify # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,6 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%global skip_python2 1 Name: python-websockify Version: 0.10.0 Release: 0 @@ -25,6 +24,7 @@ Summary: WebSocket to TCP proxy/bridge License: BSD-2-Clause AND LGPL-3.0-only AND MPL-2.0 AND BSD-3-Clause URL: https://github.com/novnc/websockify Source: https://github.com/novnc/websockify/archive/v%{version}.tar.gz +Patch1: optional-websockify.patch BuildRequires: %{python_module cryptography} BuildRequires: %{python_module jwcrypto} BuildRequires: %{python_module pytest} @@ -34,18 +34,13 @@ BuildRequires: %{python_module simplejson} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: %{python_module numpy if (%python-base without python36-base)} -%if %{python_version_nodots} > 36 -Requires: python-numpy -%endif 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-numpy Recommends: python-redis Recommends: python-simplejson %endif @@ -76,7 +71,7 @@ the target in both directions. This package contains common files. %prep -%setup -q -n websockify-%{version} +%autosetup -p1 -n websockify-%{version} # remove unwanted shebang sed -i '1 { /^#!/ d }' websockify/websock*.py