diff --git a/.gitignore b/.gitignore index 4060696..2222e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /noVNC-0.3.tar.gz /novnc-0.4.tar.gz +/v0.5.1.tar.gz diff --git a/novnc-0.4-call-websockify.patch b/novnc-0.4-call-websockify.patch deleted file mode 100644 index 7662696..0000000 --- a/novnc-0.4-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.spec b/novnc.spec index ed02015..1c862d0 100644 --- a/novnc.spec +++ b/novnc.spec @@ -1,14 +1,13 @@ Name: novnc -Version: 0.4 -Release: 9%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support Requires: python-websockify License: GPLv3 URL: https://github.com/kanaka/noVNC -Source0: https://github.com/downloads/kanaka/noVNC/novnc-%{version}.tar.gz +Source0: https://github.com/downloads/kanaka/noVNC/v%{version}.tar.gz -Patch1: novnc-0.4-call-websockify.patch Patch2: novnc-0.4-manpage.patch BuildArch: noarch BuildRequires: python2-devel @@ -17,8 +16,7 @@ BuildRequires: python2-devel Websocket implementation of VNC client %prep -%setup -q -%patch1 -p1 +%setup -q -n noVNC-%{version} %patch2 -p1 %build @@ -56,6 +54,11 @@ install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/novnc_server.1* %changelog +* Sat Jan 10 2015 Alan Pevec - 0.5.1-1 +- update to the new upstream version, for changes since 0.4 see: + https://github.com/kanaka/noVNC/releases/tag/v0.5 + https://github.com/kanaka/noVNC/releases/tag/v0.5.1 + * Sat Jun 07 2014 Fedora Release Engineering - 0.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 3fb4a4d..f69b533 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5703d5d46022d8723796dcbbf821ee7f novnc-0.4.tar.gz +ac55b2316b2164b6e09ae3bd89c37cb6 v0.5.1.tar.gz