From b050da333226bb675dadebe129e6d26681078eca Mon Sep 17 00:00:00 2001 From: jxy_git Date: Wed, 18 May 2022 14:26:45 +0800 Subject: [PATCH] Add Simplify-package-exports.patch (cherry picked from commit d95e071bbf819e0e65d715ffe4b5675f0398ccb3) --- Simplify-package-exports.patch | 58 ++++++++++++++++++++++++++++++++++ ovirt-web-ui.spec | 11 +++++-- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 Simplify-package-exports.patch diff --git a/Simplify-package-exports.patch b/Simplify-package-exports.patch new file mode 100644 index 0000000..a0074a7 --- /dev/null +++ b/Simplify-package-exports.patch @@ -0,0 +1,58 @@ +From 4fbcd79878c92de8677200c16f0dee9c9d4a58ab Mon Sep 17 00:00:00 2001 +From: Vlad Shilov +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": [ diff --git a/ovirt-web-ui.spec b/ovirt-web-ui.spec index f1b48ab..8e6d988 100644 --- a/ovirt-web-ui.spec +++ b/ovirt-web-ui.spec @@ -7,12 +7,13 @@ Name: ovirt-web-ui Version: 1.7.0 -Release: 1 +Release: 2 Summary: VM Portal for %{product} License: Apache 2.0 URL: https://github.com/oVirt/ovirt-web-ui 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 # nodejs-modules embeds yarn and requires nodejs @@ -29,6 +30,9 @@ echo "=== Workaround: 'yarn check' is recently failing on requiring webpack >= v 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." 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-nodejs-modules/bin:${PATH}" @@ -47,6 +51,9 @@ make install DESTDIR=%{buildroot} %{_sysconfdir}/ovirt-web-ui/branding/00-ovirt.brand %changelog +* Wed May 18 2022 jiangxinyu - 1.7.0-2 +- Add Simplify-package-exports.patch + * Tue Sep 7 2021 liyanan - 1.7.0-1 - update to 1.7.0