From ab4ea28cc4976d53179a1dc97020e4e2f9143ceb2d8f8fbdaf3533343dc918bc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jun 2015 08:46:32 +0000 Subject: [PATCH] osc copypac from project:Cloud:OpenStack:Kilo package:novnc revision:1, using keep-link, using expand OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/novnc?expand=0&rev=13 --- noVNC-0.4.tar.gz | 3 --- noVNC-0.5.1.tar.gz | 3 +++ novnc-0.3-call-websockify.patch | 25 ------------------------- novnc-0.3-nova-wsproxy.patch | 26 -------------------------- novnc.changes | 28 ++++++++++++++++++++++++++++ novnc.spec | 18 ++++-------------- 6 files changed, 35 insertions(+), 68 deletions(-) delete mode 100644 noVNC-0.4.tar.gz create mode 100644 noVNC-0.5.1.tar.gz delete mode 100644 novnc-0.3-call-websockify.patch delete mode 100644 novnc-0.3-nova-wsproxy.patch diff --git a/noVNC-0.4.tar.gz b/noVNC-0.4.tar.gz deleted file mode 100644 index c111be8..0000000 --- a/noVNC-0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e779c44d35d7534fdd2a3ac98c4c519fd118898147abe3a0c1d692f210b14567 -size 711551 diff --git a/noVNC-0.5.1.tar.gz b/noVNC-0.5.1.tar.gz new file mode 100644 index 0000000..00bb8c9 --- /dev/null +++ b/noVNC-0.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:095c1ce62fb9fd673123d0ba124a630757b6c11ab2f57847e44a2f35ef50a18c +size 776887 diff --git a/novnc-0.3-call-websockify.patch b/novnc-0.3-call-websockify.patch deleted file mode 100644 index 1c75d06..0000000 --- a/novnc-0.3-call-websockify.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9abeb6faf34c6413398559a203f82e1de459191c Mon Sep 17 00:00:00 2001 -From: Adam Young -Date: Fri, 8 Jun 2012 11:10:45 -0400 -Subject: [PATCH] call the websockify executable. - ---- - utils/launch.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/launch.sh b/utils/launch.sh -index 8afd6e4..baaa472 100755 ---- a/utils/launch.sh -+++ b/utils/launch.sh -@@ -92,7 +92,7 @@ else - fi - - echo "Starting webserver and WebSockets proxy on port ${PORT}" --${HERE}/wsproxy.py --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & -+${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & - proxy_pid="$!" - sleep 1 - if ! ps -p ${proxy_pid} >/dev/null; then --- -1.7.10.2 - diff --git a/novnc-0.3-nova-wsproxy.patch b/novnc-0.3-nova-wsproxy.patch deleted file mode 100644 index 011ceaa..0000000 --- a/novnc-0.3-nova-wsproxy.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dec9511e0008c28462d7a98df0629479ab0c103d Mon Sep 17 00:00:00 2001 -From: Adam Young -Date: Thu, 7 Jun 2012 10:10:41 -0400 -Subject: [PATCH] IN the final RPM, there is no wsproxy, but rather just - websockify. - ---- - utils/nova-novncproxy | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy -index a920492..a172212 100755 ---- a/utils/nova-novncproxy -+++ b/utils/nova-novncproxy -@@ -26,7 +26,7 @@ import Cookie - import socket - import sys - --import wsproxy -+import websockify as wsproxy - - from nova import context - from nova import flags --- -1.7.10.2 - diff --git a/novnc.changes b/novnc.changes index 62e3aa9..76abcb5 100644 --- a/novnc.changes +++ b/novnc.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Feb 16 23:59:26 UTC 2015 - vuntz@suse.com + +- Update to 0.5.1: + + Improved keyboard support via use of keysyms.js + + Fix HEXTILE "blank" tile support + + lower minimum width to accommodate smaller screens + + Fix issue causing true-color cursors to not be changed + + Fix subprotocol support for the TIGHT encoding +- Changes from 0.5.0: + + General Fixes/Improvements: + - Use Object.defineProperty on Array prototype to prevent + issues with enumeration + - Internal Refactor for improved testability + - Improved parsing of query string parameters + - Support container page scrolling + - Fixed IE10 keyboard support + - Fixes for mobile keyboards (Android and iOS) + - Improved foreign keyboard support + - dynamic script loading without document.write + + Protocol Support: + - TightVNC support (we support choosing the NOTUNNEL type if + tunnels are requested) + - XVP Support +- Update license tag to "MPL-2.0; LGPL-3.0", following relicensing. +- Drop novnc-0.3-call-websockify.patch, + novnc-0.3-nova-wsproxy.patch: not needed anymore. + ------------------------------------------------------------------- Tue Sep 24 19:38:06 UTC 2013 - dmueller@suse.com diff --git a/novnc.spec b/novnc.spec index 64fca96..ad47e08 100644 --- a/novnc.spec +++ b/novnc.spec @@ -1,7 +1,7 @@ # # spec file for package novnc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,16 @@ Name: novnc -Version: 0.4 +Version: 0.5.1 Release: 0 Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support -License: GPL-3.0 +License: MPL-2.0 and LGPL-3.0 Group: System/Daemons Url: https://github.com/kanaka/noVNC Source0: noVNC-%{version}.tar.gz -Patch0: novnc-0.3-nova-wsproxy.patch Patch1: novnc-0.3-manpage.patch -Patch2: novnc-0.3-call-websockify.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel @@ -40,9 +38,7 @@ Websocket implementation of VNC client %prep %setup -q -n noVNC-%{version} -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %build @@ -65,14 +61,8 @@ install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/ %files %defattr(-,root,root,-) %doc README.md LICENSE.txt - -%dir %{_usr}/share/novnc -%{_usr}/share/novnc/*.* -%dir %{_usr}/share/novnc/include -%{_usr}/share/novnc/include/* -%dir %{_usr}/share/novnc/images -%{_usr}/share/novnc/images/* %{_bindir}/novnc_server +%{_datadir}/novnc/ %{_mandir}/man1/novnc_server.1* %changelog