From 1484a16795b26c8aec11b2962895f3d020f49e21 Mon Sep 17 00:00:00 2001
From: wangmy <wangmy@fujitsu.com>
Date: Wed, 19 Jan 2022 13:13:14 +0800
Subject: python3-novnc: update 0.5.1 -> 1.3.0

refresh python-distutils.patch

License-Update:
-year updated to 2019
-file of the noVNC core library changed
-the HTML, CSS, font and images files that included with the noVNC
 source distibution changed
-URL of history changed
-files and projects that have been incorporated into
 the noVNC core library changed
-license texts changed

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 .../python/python-novnc/python-distutils.patch       | 19 -------------------
 .../recipes-devtools/python/python-novnc_git.bb      | 20 --------------------
 .../python/python3-novnc/python-distutils.patch      | 19 +++++++++++++++++++
 .../recipes-devtools/python/python3-novnc_git.bb     | 18 ++++++++++++++++++
 4 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch
 delete mode 100644 meta-openstack/recipes-devtools/python/python-novnc_git.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
 create mode 100644 meta-openstack/recipes-devtools/python/python3-novnc_git.bb

diff --git a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch b/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch
deleted file mode 100644
index ef3393f..0000000
--- a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: git/setup.py
-===================================================================
---- /dev/null
-+++ git/setup.py
-@@ -0,0 +1,14 @@
-+#!/usr/bin/env python
-+
-+from distutils.core import setup
-+
-+setup(name='python-novnc',
-+      version='2012.1~e3',
-+      description='NoVNC python libraries',
-+      author='Ghe Rivero',
-+      author_email='ghe.rivero@stackops.com',
-+      url='http://www.stackops.com',
-+      packages = ['novnc'],
-+      package_dir = {'novnc':'utils'},
-+      py_modules=['wsproxy','websocket','web','json2graph','img2js'],
-+)
diff --git a/meta-openstack/recipes-devtools/python/python-novnc_git.bb b/meta-openstack/recipes-devtools/python/python-novnc_git.bb
deleted file mode 100644
index da5f048..0000000
--- a/meta-openstack/recipes-devtools/python/python-novnc_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "This package contains the core python parts of NoVNC"
-HOMEPAGE = "https://github.com/kanaka/noVNC"
-SECTION = "devel/python"
-
-PR = "r0"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6458695fb66dcd893becb5f9f912715e"
-
-SRCREV = "3b8ec46fd26d644e6edbea4f46e630929297e448"
-PV = "0.5.1+git${SRCPV}"
-
-SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https \
-           file://python-distutils.patch"
-
-S = "${WORKDIR}/git"
-
-inherit setuptools3
-
-DEPENDS += " python3-websockify"
diff --git a/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
new file mode 100644
index 0000000..85befc9
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
@@ -0,0 +1,19 @@
+Index: git/setup.py
+===================================================================
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,14 @@
++#!/usr/bin/env python
++
++from distutils.core import setup
++
++setup(name='python3-novnc',
++      version='2012.1~e3',
++      description='NoVNC python libraries',
++      author='Ghe Rivero',
++      author_email='ghe.rivero@stackops.com',
++      url='http://www.stackops.com',
++      packages = ['novnc'],
++      package_dir = {'novnc':'utils'},
++      py_modules=['wsproxy','websocket','web','json2graph','img2js'],
++)
diff --git a/meta-openstack/recipes-devtools/python/python3-novnc_git.bb b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
new file mode 100644
index 0000000..b41b587
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "This package contains the core python parts of NoVNC"
+HOMEPAGE = "https://github.com/kanaka/noVNC"
+SECTION = "devel/python"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99aebbcc36b17df855fad64d4b792bff"
+
+SRCREV = "463c39e4af98ec4106b87bbea17e1605aa4c6180"
+PV = "1.3.0"
+
+SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https \
+           file://python-distutils.patch"
+
+S = "${WORKDIR}/git"
+
+inherit setuptools3
+
+DEPENDS += " python3-websockify"
-- 
cgit v1.2.3-54-g00ecf