[novnc/el6-grizzly] Import config module from oslo

[Nikola Dipanov]

commit 5f5aba31a44c9cd7895e95c6ba06902fb899cf0e
Author: Nikola Dipanov <ndipanov at redhat.com>
Date:   Mon Apr 8 16:13:20 2013 +0200

    Import config module from oslo

 novnc-0.4-nova-conf-oslo.patch |   34 ++++++++++++++++++++++++++++++++++
 novnc.spec                     |    7 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/novnc-0.4-nova-conf-oslo.patch b/novnc-0.4-nova-conf-oslo.patch
new file mode 100644
index 0000000..6ffbaff
--- /dev/null
+++ b/novnc-0.4-nova-conf-oslo.patch
@@ -0,0 +1,34 @@
+From de0f8773b15dfa20c0fd631580ce0df475bd6247 Mon Sep 17 00:00:00 2001
+From: Nikola Dipanov <ndipanov at redhat.com>
+Date: Mon, 8 Apr 2013 15:42:56 +0200
+Subject: [PATCH] Import cfg from oslo in nova-novncproxy
+
+Upstram OpenStack Nova package has moved the config engine into a
+separate package. Mirror that change in the novnc script.
+---
+ utils/nova-novncproxy |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy
+index c3afe44..a1a6947 100755
+--- a/utils/nova-novncproxy
++++ b/utils/nova-novncproxy
+@@ -23,6 +23,7 @@ Leverages wsproxy.py by Joel Martin
+ '''
+ 
+ import Cookie
++from oslo.config import cfg
+ import socket
+ import sys
+ 
+@@ -31,7 +32,6 @@ import wsproxy
+ from nova import config
+ from nova import context
+ from nova import utils
+-from nova.openstack.common import cfg
+ from nova.openstack.common import rpc
+ 
+ 
+-- 
+1.7.9.5
+
diff --git a/novnc.spec b/novnc.spec
index 5bc556c..c459cfd 100644
--- a/novnc.spec
+++ b/novnc.spec
@@ -15,7 +15,7 @@
 
 Name:           novnc
 Version:        0.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        VNC client using HTML5 (Web Sockets, Canvas) with encryption support
 Requires:       python-websockify
 
@@ -30,6 +30,7 @@ Source3:        openstack-nova-novncproxy.sysconfig
 Patch1:         novnc-0.4-manpage.patch
 Patch2:         novnc-0.4-call-websockify.patch
 Patch3:		novnc-0.4-nova-flags-to-conf.patch
+Patch4:		novnc-0.4-nova-conf-oslo.patch
 Patch100:       novnc-0.4-nova-wsproxy.patch
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -63,6 +64,7 @@ OpenStack Nova noVNC server that proxies VNC traffic over Websockets
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch100 -p1
 
 %build
@@ -139,6 +141,9 @@ fi
 %endif
 
 %changelog
+* Mon Apr 08 2013 Nikola Đipanov <ndipanov at redhat.com> - 0.4-7
+- Import config module from oslo in nova-novncproxy
+
 * Tue Mar 19 2013 Nikola Đipanov <ndipanov at redhat.com> - 0.4-6
 - Bump the version number of the el6-grizzly branch