[novnc/f18] Moves to the 0.4.0 upstream version of the code

[Nikola Dipanov]

commit f3a352eeee968e7a31517b892e3cdd05e681d96a
Author: Nikola Dipanov <ndipanov at redhat.com>
Date:   Mon Oct 22 16:39:54 2012 +0200

    Moves to the 0.4.0 upstream version of the code
    
    Needed for this package to work with nova-folsom

 .gitignore                                         |    1 +
 ...ockify.patch => novnc-0.4-call-websockify.patch |    0
 novnc-0.3-manpage.patch => novnc-0.4-manpage.patch |    0
 ...a-wsproxy.patch => novnc-0.4-nova-wsproxy.patch |    0
 novnc.spec                                         |   17 +++++++++--------
 openstack-nova-novncproxy.service                  |    2 +-
 sources                                            |    2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cfd8481..4060696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /noVNC-0.3.tar.gz
+/novnc-0.4.tar.gz
diff --git a/novnc-0.3-call-websockify.patch b/novnc-0.4-call-websockify.patch
similarity index 100%
rename from novnc-0.3-call-websockify.patch
rename to novnc-0.4-call-websockify.patch
diff --git a/novnc-0.3-manpage.patch b/novnc-0.4-manpage.patch
similarity index 100%
rename from novnc-0.3-manpage.patch
rename to novnc-0.4-manpage.patch
diff --git a/novnc-0.3-nova-wsproxy.patch b/novnc-0.4-nova-wsproxy.patch
similarity index 100%
rename from novnc-0.3-nova-wsproxy.patch
rename to novnc-0.4-nova-wsproxy.patch
diff --git a/novnc.spec b/novnc.spec
index 19dce18..4833835 100644
--- a/novnc.spec
+++ b/novnc.spec
@@ -14,21 +14,21 @@
 %endif
 
 Name:           novnc
-Version:        0.3
-Release:        12%{?dist}
+Version:        0.4
+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/novnc-%{version}.tar.gz
 Source1:        openstack-nova-novncproxy.service
 Source2:        openstack-nova-novncproxy.init
 
 
-Patch0:         novnc-0.3-nova-wsproxy.patch
-Patch1:         novnc-0.3-manpage.patch
-Patch2:         novnc-0.3-call-websockify.patch
+Patch0:         novnc-0.4-nova-wsproxy.patch
+Patch1:         novnc-0.4-manpage.patch
+Patch2:         novnc-0.4-call-websockify.patch
 BuildArch:      noarch
 BuildRequires:  python2-devel
 
@@ -82,7 +82,6 @@ install utils/launch.sh  %{buildroot}/%{_bindir}/novnc_server
 install utils/nova-novncproxy %{buildroot}/%{_bindir}
 
 mkdir -p %{buildroot}%{_mandir}/man1/
-install -m 444 docs/nova-novncproxy.1 %{buildroot}%{_mandir}/man1/
 install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/
 
 %if %{with_systemd}
@@ -126,7 +125,6 @@ fi
 
 %files -n openstack-nova-novncproxy
 %{_bindir}/nova-novncproxy
-%{_mandir}/man1/nova-novncproxy.1*
 %if %{with_systemd}
 %{_unitdir}/openstack-nova-novncproxy.service
 %else
@@ -134,6 +132,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 22 2012 Nikola Đipanoov <ndipanov at redhat.com> - 0.4-1
+- Moves to upstream version 0.4.0
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/openstack-nova-novncproxy.service b/openstack-nova-novncproxy.service
index 04464b5..cac8aad 100644
--- a/openstack-nova-novncproxy.service
+++ b/openstack-nova-novncproxy.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=nova
-ExecStart=/usr/bin/nova-novncproxy --flagfile=/etc/nova/nova.conf --web /usr/share/novnc/
+ExecStart=/usr/bin/nova-novncproxy --web /usr/share/novnc/
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sources b/sources
index aac5588..3fb4a4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95d3c58921fa188c179491e8ef2acc12  noVNC-0.3.tar.gz
+5703d5d46022d8723796dcbbf821ee7f  novnc-0.4.tar.gz