diff --git a/debian/control b/debian/control index e225c9e8c4..8975d47bcd 100644 --- a/debian/control +++ b/debian/control @@ -179,8 +179,6 @@ Recommends: python-dbus ,python-cups #for ssh transport: ,python-paramiko -#for html5 support: - ,websockify #the start-session GUI: ,python-xdg # for webcam support: @@ -238,8 +236,6 @@ Recommends: python3-dbus ,python3-cups #for ssh transport: ,python3-paramiko -#for html5 support: - ,python3-websockify #the start-session GUI: ,python3-xdg # for webcam support: diff --git a/osx/Helpers/Websockify b/osx/Helpers/Websockify deleted file mode 100755 index 8452ba0e09..0000000000 --- a/osx/Helpers/Websockify +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -#call the "Python" wrapper: -exe_name=$(basename $0) -full_path=$(cd "$(dirname "$0")"; pwd -P) -PYTHON="$full_path/PythonExecWrapper" - -exec "$PYTHON" "$exe_name" -c "import sys;sys.argv[0]=\"$full_path/$exe_name\";import websockify;websockify.websocketproxy.websockify_init()" "$@" diff --git a/osx/jhbuild/xpra-python.modules b/osx/jhbuild/xpra-python.modules index faa5182570..f4879f2241 100644 --- a/osx/jhbuild/xpra-python.modules +++ b/osx/jhbuild/xpra-python.modules @@ -294,19 +294,6 @@ - - - - - - - - - - - diff --git a/osx/jhbuild/xpra-python3.modules b/osx/jhbuild/xpra-python3.modules index 1cfaa61a37..3fca411258 100644 --- a/osx/jhbuild/xpra-python3.modules +++ b/osx/jhbuild/xpra-python3.modules @@ -308,19 +308,6 @@ - - - - - - - - - - - diff --git a/rpmbuild/python-websockify.spec b/rpmbuild/python-websockify.spec deleted file mode 100644 index b77a2d03f5..0000000000 --- a/rpmbuild/python-websockify.spec +++ /dev/null @@ -1,50 +0,0 @@ -%{!?__python2: %define __python2 python2} - -Name: python-websockify -Version: 0.8.0 -Release: 2%{?dist} -Summary: WSGI based adapter for the Websockets protocol - -License: LGPLv3 -URL: https://github.com/kanaka/websockify -Source0: https://github.com/kanaka/websockify/archive/v%{version}.tar.gz#/websockify-%{version}.tar.gz -BuildArch: noarch -BuildRequires: python-devel -BuildRequires: python-setuptools -Requires: python-setuptools - -%description -Python WSGI based adapter for the Websockets protocol - -%prep -%setup -q -n websockify-%{version} - -# TODO: Have the following handle multi line entries -sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py - -%build -%{__python2} setup.py build - - -%install -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} - -rm -Rf %{buildroot}/usr/share/websockify -mkdir -p %{buildroot}%{_mandir}/man1/ -install -m 444 docs/websockify.1 %{buildroot}%{_mandir}/man1/ - - -%files -%doc LICENSE.txt docs -%{_mandir}/man1/websockify.1* -%{python_sitelib}/websockify/* -%{python_sitelib}/websockify-%{version}-py?.?.egg-info -%{_bindir}/websockify - - -%changelog -* Tue Jul 03 2018 Antoine Martin - 0.8.0-2 -- use python2 explicitly - -* Wed Jan 17 2018 Antoine Martin - 0.8.0-1 -- initial CentOS packaging diff --git a/rpmbuild/xpra.spec b/rpmbuild/xpra.spec index 5195093197..9c72a6abd8 100644 --- a/rpmbuild/xpra.spec +++ b/rpmbuild/xpra.spec @@ -311,23 +311,19 @@ Requires: pygtk2 %{Recommends}: python2-pynvml %endif %if 0%{?fedora} -Recommends: python2-websockify Recommends: python2-xpra-audio Recommends: cups-pdf Recommends: python2-cups Recommends: python2-uinput Recommends: python2-setproctitle %if 0%{?run_tests} -BuildRequires: python2-websockify BuildRequires: python2-websocket-client %endif %endif %if 0%{?el7} Requires: python-cups -Requires: python-websockify Requires: python-setproctitle %if 0%{?run_tests} -BuildRequires: python-websockify BuildRequires: python-websocket-client %endif %endif @@ -437,14 +433,12 @@ Summary: python3 build of xpra server Group: Networking Requires: xpra-common-server = %{?epoch_prefix}%{version}-%{release} Requires: python3-xpra = %{?epoch_prefix}%{version}-%{release} -Requires: python3-websockify Recommends: cups-filters Recommends: cups-pdf Recommends: python3-cups Recommends: gtk3-immodule-xim Recommends: python3-setproctitle %if 0%{?run_tests} -BuildRequires: python3-websockify BuildRequires: python3-websocket-client %endif %if %{with_cuda}