Upgrade to latest TurboVNC and python-websockify (#271)

* Upgrade to latest TurboVNC and python-websockify
Fixes #268

* Pull in some EPEL changes to fix python-websockify

* Need zlib-devel for TurboVNC

lib/ood_packaging/version.rb

@@ -22,8 +22,8 @@ module OodPackaging
       '(ubuntu|debian)' => '3.1.0',
       'default'         => '3.1.0'
     },
-    'python-websockify'       => '0.10.0',
-    'turbovnc'                => '2.2.5'
+    'python-websockify'       => '0.11.0',
+    'turbovnc'                => '3.1'
   }.freeze
 
   def self.package_version(package, dist)

packages/python-websockify/rpm/python-websockify.spec

@@ -1,7 +1,8 @@
 %{!?package_release: %define package_release 1}
 %define __brp_mangle_shebangs /bin/true
+%global pkgname websockify
 
-Name:           python3-websockify
+Name:           python3-%{pkgname}
 Version:        %{package_version}
 Release:        %{package_release}%{?dist}
 Summary:        WSGI based adapter for the Websockets protocol
@@ -11,6 +12,7 @@ URL:            https://github.com/novnc/websockify
 Source0:        https://github.com/novnc/websockify/archive/refs/tags/v%{package_version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 Requires:       python3-setuptools
 Obsoletes:      python-websockify
@@ -19,25 +21,21 @@ Obsoletes:      python-websockify
 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
+%autosetup -n %{pkgname}-%{version}
 
 %build
-%{__python3} setup.py build
-
+%py3_build
 
 %install
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+%py3_install
 
 rm -Rf %{buildroot}/usr/share/websockify
 mkdir -p %{buildroot}%{_mandir}/man1/
 install -m 444 docs/websockify.1 %{buildroot}%{_mandir}/man1/
 
 
 %files
-%doc docs
+%license COPYING
 %{_mandir}/man1/websockify.1*
 %{python3_sitelib}/websockify/*
 %{python3_sitelib}/websockify-%{version}-py?.?.egg-info