From f45e50b186521ac1f9abff64544fe19022424084 Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Aug 25 2020 22:21:54 +0000
Subject: Drop py2 support


This is no longer required with Fedora 33 and RDO >= Train releases.

---

diff --git a/novnc.spec b/novnc.spec
index a14fb25..cb4f5f2 100644
--- a/novnc.spec
+++ b/novnc.spec
@@ -1,15 +1,8 @@
-# Macros for py2/py3 compatibility
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global pyver %{python3_pkgversion}
-%else
-%global pyver 2
-%endif
-
 Name:           novnc
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VNC client using HTML5 (Web Sockets, Canvas) with encryption support
-Requires:       python%{pyver}-websockify
+Requires:       python3-websockify
 
 License:        GPLv3
 URL:            https://github.com/novnc/noVNC
@@ -17,10 +10,7 @@ Source0:        https://github.com/novnc/noVNC/archive/v%{version}.tar.gz
 
 
 BuildArch:      noarch
-BuildRequires:  python%{pyver}-devel
-%if %{pyver} == 3
-BuildRequires: /usr/bin/pathfix.py
-%endif
+BuildRequires:  python3-devel
 
 %description
 noVNC is both a HTML VNC client JavaScript library and an application built on
@@ -30,13 +20,6 @@ browsers (iOS and Android).
 %prep
 %setup -q -n noVNC-%{version}
 
-
-%if %{pyver} == 3
-# Fix any python shebangs within the novnc codebase
-# https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
-%endif
-
 %build
 
 %install
@@ -60,6 +43,9 @@ install utils/launch.sh  %{buildroot}/%{_bindir}/%{name}_server
 %{_bindir}/%{name}_server
 
 %changelog
+* Tue Aug 25 2020 Lee Yarwood <lyarwood@redhat.com> - 1.2.0-2
+- Drop py2 support
+
 * Tue Aug 25 2020 Lee Yarwood <lyarwood@redhat.com> - 1.2.0-1
 - New upstream release 1.2.0