diff --git a/ovirt-web-ui-1.6.0.tar.gz b/ovirt-web-ui-1.6.0.tar.gz deleted file mode 100644 index 5d686c4..0000000 Binary files a/ovirt-web-ui-1.6.0.tar.gz and /dev/null differ diff --git a/ovirt-web-ui-1.7.0.tar.gz b/ovirt-web-ui-1.7.0.tar.gz new file mode 100644 index 0000000..d868ad7 Binary files /dev/null and b/ovirt-web-ui-1.7.0.tar.gz differ diff --git a/ovirt-web-ui.spec b/ovirt-web-ui.spec index aa9bfc0..f1b48ab 100644 --- a/ovirt-web-ui.spec +++ b/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,33 @@ %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 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 %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 +47,8 @@ make install DESTDIR=%{buildroot} %{_sysconfdir}/ovirt-web-ui/branding/00-ovirt.brand %changelog +* Tue Sep 7 2021 liyanan - 1.7.0-1 +- update to 1.7.0 + * Thu Mar 5 2020 di.wang - 1.6.0-1 - Package Initialization