#5 novnc-1.1.0-2
Merged 2 months ago by lyarwood. Opened 2 months ago by lyarwood.
rpms/ lyarwood/novnc master-launch.sh-workaround  into  master

@@ -0,0 +1,29 @@ 

+ From 9f62259366e1652777fb88c91675c6c1aebbd38b Mon Sep 17 00:00:00 2001

+ From: Lee Yarwood <lyarwood@redhat.com>

+ Date: Tue, 9 Jul 2019 12:12:43 +0100

+ Subject: [PATCH] launch.sh: Check for a local websockify directory

+ 

+ Previously launch.sh would check both for the existence of a local

+ websockify file and /websockify/run file.

+ 

+ This initial check should really be for a local websockify directory

+ as in packaged environments a file could very well be the actual

+ executable leading to launch.sh incorrectly attempting to use a local

+ version of websockify.

+ ---

+  utils/launch.sh | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/utils/launch.sh b/utils/launch.sh

+ index 162607e..2e5e68f 100755

+ --- a/utils/launch.sh

+ +++ b/utils/launch.sh

+ @@ -117,7 +117,7 @@ else

+  fi

+  

+  # try to find websockify (prefer local, try global, then download local)

+ -if [[ -e ${HERE}/websockify ]]; then

+ +if [[ -d ${HERE}/websockify ]]; then

+      WEBSOCKIFY=${HERE}/websockify/run

+  

+      if [[ ! -x $WEBSOCKIFY ]]; then

file modified
+8 -1

@@ -1,6 +1,6 @@ 

  Name:           novnc

  Version:        1.1.0

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        VNC client using HTML5 (Web Sockets, Canvas) with encryption support

  Requires:       python3-websockify

  

@@ -8,6 +8,8 @@ 

  URL:            https://github.com/novnc/noVNC

  Source0:        https://github.com/novnc/noVNC/archive/v%{version}.tar.gz

  

+ Patch0001: 0001-launch.sh-Check-for-a-local-websockify-directory.patch

+ 

  BuildArch:      noarch

  BuildRequires:  python3-devel

  BuildRequires: /usr/bin/pathfix.py

@@ -20,6 +22,8 @@ 

  %prep

  %setup -q -n noVNC-%{version}

  

+ %patch0001 -p1

+ 

  # 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}" .

@@ -47,6 +51,9 @@ 

  %{_bindir}/%{name}_server

  

  %changelog

+ * Tue Aug 08 2019 Lee Yarwood <lyarwood@redhat.com> 1.1.0-3

+ - launch.sh: Check for a local websockify directory

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

Changelog:
- launch.sh: Check for a local websockify directory

Metadata Update from @lyarwood:
- Request assigned

2 months ago

This is the latter change we talked about. LGTM.

rebased onto f5d8716

2 months ago

Pull-Request has been merged by lyarwood

2 months ago