From a16fa3fa79ebcb1f524db0410ac7c3d8133c6959 Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Jul 09 2019 11:43:43 +0000
Subject: Update to 1.1.0


This commit also makes the following changes to ensure noVNC is actually
usable once installed.

- Switch to python3-websockify as a dependency. Resolving this bug:

  novnc requires python3-websockify but RPM is missing the dependency
  https://bugzilla.redhat.com/show_bug.cgi?id=1706294

- Rework the %install section to ensure all required files
  are installed under /usr/share/novnc. Resolving this bug:

  [OSP 15] novnc RPM is not packaged with all the required files
  https://bugzilla.redhat.com/show_bug.cgi?id=1726312

- Leave a FIXME regarding a current bug with /usr/bin/novnc_server.
  This is tracked by the following bug:

  Can't start novnc using novnc_server script
  https://bugzilla.redhat.com/show_bug.cgi?id=1706291

  A pull request has also been opened to resolve this below:

  launch.sh: Check for a local websockify directory
  https://github.com/novnc/noVNC/pull/1259

- Convert any python shebangs during %prep.

- Install a copy of vnc_lite.html as vnc_auto.html and ensure this is
  tracked as part of the package.

---

diff --git a/.gitignore b/.gitignore
index 45e3f82..0c06cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /v0.5.1.tar.gz
 /v0.6.1.tar.gz
 /v1.0.0.tar.gz
+/v1.1.0.tar.gz
diff --git a/novnc.spec b/novnc.spec
index 4537988..a8b28b9 100644
--- a/novnc.spec
+++ b/novnc.spec
@@ -1,15 +1,16 @@
 Name:           novnc
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        VNC client using HTML5 (Web Sockets, Canvas) with encryption support
-Requires:       python2-websockify
+Requires:       python3-websockify
 
 License:        GPLv3
 URL:            https://github.com/novnc/noVNC
 Source0:        https://github.com/novnc/noVNC/archive/v%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  python2-devel
+BuildRequires:  python3-devel
+BuildRequires: /usr/bin/pathfix.py
 
 %description
 noVNC is both a HTML VNC client JavaScript library and an application built on
@@ -19,36 +20,41 @@ browsers (iOS and Android).
 %prep
 %setup -q -n noVNC-%{version}
 
-%build
+# 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}" .
 
+%build
 
 %install
-mkdir -p %{buildroot}/%{_usr}/share/novnc/utils
-install -m 444 *html %{buildroot}/%{_usr}/share/novnc
-#provide an index file to prevent default directory browsing
-install -m 444 vnc.html %{buildroot}/%{_usr}/share/novnc/index.html
-mkdir -p %{buildroot}/%{_bindir}
-install utils/launch.sh  %{buildroot}/%{_bindir}/novnc_server
+mkdir -p %{buildroot}/%{_datadir}/%{name}/
+cp -r * %{buildroot}/%{_datadir}/%{name}/
+
+# provide an index file to prevent default directory browsing
+install -m 444 vnc.html %{buildroot}/%{_datadir}/%{name}/index.html
 
-%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig
+# install a copy of the new vnc_lite.html page as the old <1.0.0 vnc_auto.html page
+install -m 444 vnc_lite.html %{buildroot}/%{_datadir}/%{name}/vnc_auto.html
 
-%post
-#symlink the <1.0.0 vnc_auto.html page to the new >=1.0.0 vnc_lite.html page.
-ln -s -f %{_usr}/share/novnc/vnc_lite.html %{_usr}/share/novnc/vnc_auto.html
+# FIXME(lyarwood): launch.sh fails to find the installed version of websockify
+# Addressed by https://github.com/novnc/noVNC/pull/1259 
+mkdir -p %{buildroot}/%{_bindir}/
+install utils/launch.sh  %{buildroot}/%{_bindir}/%{name}_server
 
 %files
 %doc README.md LICENSE.txt
-
-%dir %{_usr}/share/novnc
-%{_usr}/share/novnc/*.*
-%{_bindir}/novnc_server
+%{_datadir}/%{name}
+%{_bindir}/%{name}_server
 
 %changelog
+* Fri Jul 05 2019 Lee Yarwood <lyarwood@redhat.com> - 1.1.0-1
+- Update to 1.1.0
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
 * Thu Aug 02 2018 Lee Yarwood <lyarwood@redhat.com> - 1.0.0-1
-  Update to 1.0.0
+- Update to 1.0.0
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 047233b..73bef57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.0.0.tar.gz) = 97a86be5f10f382e2ed641360f5f6c3b22998f68f980c78138aca900ef6a011c1f6aa9cbdd8cd07afd4884e8c65af30d65487e87bb34e524c10f16cf4cd116a3
+SHA512 (v1.1.0.tar.gz) = 9c736912f5a3051027efe779fc64b182f523b9378ff412d78202e52665772678846d97fe3cc5ac18f5c29dd83d5ff2a2dd915e5eadf9af3573fe871db2e7821e