update to 1.7.0

Simplify-package-exports.patch

@@ -0,0 +1,58 @@
+From 4fbcd79878c92de8677200c16f0dee9c9d4a58ab Mon Sep 17 00:00:00 2001
+From: Vlad Shilov <omgovich@ya.ru>
+Date: Thu, 20 May 2021 02:25:21 +0300
+Subject: [PATCH] Simplify package "exports"
+
+---
+ package.json | 38 ++++++++++++++++++++++++++++++++++----
+ 1 file changed, 34 insertions(+), 4 deletions(-)
+
+diff --git a/package.json b/package.json
+index 24c4fb5..9721894 100644
+--- a/package.json
++++ b/package.json
+@@ -32,10 +32,40 @@
+       "require": "./index.js",
+       "default": "./index.mjs"
+     },
+-    "./plugins/*": {
+-      "import": "./plugins/*.mjs",
+-      "require": "./plugins/*.js",
+-      "default": "./plugins/*.mjs"
++    "./plugins/a11y": {
++      "import": "./plugins/a11y.mjs",
++      "require": "./plugins/a11y.js",
++      "default": "./plugins/a11y.mjs"
++    },
++    "./plugins/hwb": {
++      "import": "./plugins/hwb.mjs",
++      "require": "./plugins/hwb.js",
++      "default": "./plugins/hwb.mjs"
++    },
++    "./plugins/lab": {
++      "import": "./plugins/lab.mjs",
++      "require": "./plugins/lab.js",
++      "default": "./plugins/lab.mjs"
++    },
++    "./plugins/lch": {
++      "import": "./plugins/lch.mjs",
++      "require": "./plugins/lch.js",
++      "default": "./plugins/lch.mjs"
++    },
++    "./plugins/mix": {
++      "import": "./plugins/mix.mjs",
++      "require": "./plugins/mix.js",
++      "default": "./plugins/mix.mjs"
++    },
++    "./plugins/names": {
++      "import": "./plugins/names.mjs",
++      "require": "./plugins/names.js",
++      "default": "./plugins/names.mjs"
++    },
++    "./plugins/xyz": {
++      "import": "./plugins/xyz.mjs",
++      "require": "./plugins/xyz.js",
++      "default": "./plugins/xyz.mjs"
+     }
+   },
+   "files": [

ovirt-web-ui.spec

@@ -1,4 +1,3 @@
-# Used for rpm-packaging of pre-bundled application with already resolved JS dependencies
 %global product oVirt
 
 %global use_rhev %( test -z @RHEV@ && echo 1 || echo 0)
@@ -7,41 +6,37 @@
 %global source_basename ovirt-web-ui
 
 Name:           ovirt-web-ui
-Version:        1.6.0
-Release:        1%{?release_suffix}%{?checkout}%{?dist}
+Version:        1.7.0
+Release:        1
 Summary:        VM Portal for %{product}
-License:        ASL 2.0
+License:        Apache 2.0
 URL:            https://github.com/oVirt/ovirt-web-ui
-Source0:        https://github.com/oVirt/ovirt-web-ui/archive/%{source_basename}-1.6.0.tar.gz
-
+Source0:        https://github.com/oVirt/ovirt-web-ui/archive/%{source_basename}-1.7.0.tar.gz
+#https://patch-diff.githubusercontent.com/raw/omgovich/colord/pull/52.patch
+patch1:         Simplify-package-exports.patch
 BuildArch: noarch
 
-# Keep ovirt-engine-{nodejs|nodejs-modules|yarn} at particular version unless tested on higher
-BuildRequires: ovirt-engine-nodejs = 8.11.4
-BuildRequires: ovirt-engine-yarn = 1.7.0
-
-BuildRequires: ovirt-engine-nodejs-modules >= 1.8.16
+# nodejs-modules embeds yarn and requires nodejs
+BuildRequires: ovirt-engine-nodejs-modules >= 2.0.53-1
 
 %description
 This package provides the VM Portal for %{product}.
 
 %prep
-# Use the ovirt-engine nodejs installation
-# export PATH="%{_datadir}/ovirt-engine-nodejs/bin:${PATH}"
-
 %setup -q -n"%{source_basename}-%{version}"
 rpm -qa | grep ovirt-engine-nodejs
 
 echo "=== Workaround: 'yarn check' is recently failing on requiring webpack >= v2. Manually"
 echo "=== verified that this is ok for recent code base but may be a real failure in the"
 echo "=== future. Please watch carefully for other potential types of errors."
-export IGNORE_YARN_CHECK=1
-source /usr/share/ovirt-engine-nodejs-modules/setup-env.sh
+IGNORE_YARN_CHECK=1 source /usr/share/ovirt-engine-nodejs-modules/setup-env.sh
+pushd  node_modules/colord
+%patch1 -p1
+popd
 
 %build
-export PATH="%{_datadir}/ovirt-engine-nodejs/bin:%{_datadir}/ovirt-engine-yarn/bin:${PATH}"
+export PATH="%{_datadir}/ovirt-engine-nodejs/bin:%{_datadir}/ovirt-engine-nodejs-modules/bin:${PATH}"
 %configure
-export PATH="./node_modules/.bin:${PATH}"
 make
 
 %install
@@ -56,5 +51,8 @@ make install DESTDIR=%{buildroot}
 %{_sysconfdir}/ovirt-web-ui/branding/00-ovirt.brand
 
 %changelog
+* Tue Sep 7 2021 liyanan <liyanan32@huawei.com> - 1.7.0-1
+- update to 1.7.0
+
 * Thu Mar 5 2020 di.wang <di.wang@cs2c.com.cn> - 1.6.0-1
 - Package Initialization