From 135c7c9f28f801e93339aa47707876f506ed286c Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Aug 09 2019 16:23:18 +0000
Subject: Only pull in pathfix.py during py3 builds


Local mockbuilds had previously suggested pathfix.py was required to
update a few files when building for py2. However later rebuilds in CBS
showed that this wasn't the case so we can skip the dependency and use
of pathfix for py2.

---

diff --git a/novnc.spec b/novnc.spec
index 167d365..eecf581 100644
--- a/novnc.spec
+++ b/novnc.spec
@@ -7,7 +7,7 @@
 
 Name:           novnc
 Version:        1.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        VNC client using HTML5 (Web Sockets, Canvas) with encryption support
 Requires:       python%{pyver}-websockify
 
@@ -19,7 +19,9 @@ Patch0001: 0001-launch.sh-Check-for-a-local-websockify-directory.patch
 
 BuildArch:      noarch
 BuildRequires:  python%{pyver}-devel
+%if %{pyver} == 3
 BuildRequires: /usr/bin/pathfix.py
+%endif
 
 %description
 noVNC is both a HTML VNC client JavaScript library and an application built on
@@ -31,11 +33,6 @@ browsers (iOS and Android).
 
 %patch0001 -p1
 
-%if %{pyver} == 2
-# Fix ./utils/img2js.py and ./utils/json2graph.py still for py2
-pathfix.py -pni "%{__python2} %{py2_shbang_opts}" .
-%endif
-
 %if %{pyver} == 3
 # Fix any python shebangs within the novnc codebase
 # https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error
@@ -65,6 +62,9 @@ install utils/launch.sh  %{buildroot}/%{_bindir}/%{name}_server
 %{_bindir}/%{name}_server
 
 %changelog
+* Fri Aug 09 2019 Lee Yarwood <lyarwood@redhat.com> 1.1.0-6
+- Drop use of pathfix for py2 builds.
+
 * Fri Aug 09 2019 Lee Yarwood <lyarwood@redhat.com> 1.1.0-5
 - Make the spec compatible for both py2 and py3.