diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index f087b429e2f81a9f37b28a8308e2210f84df6c9b..0000000000000000000000000000000000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -*.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/esbuild_arm-v2.3.1.tar.gz b/esbuild_arm-v2.3.1.tar.gz deleted file mode 100644 index 68c84fc3a098d0e859683a4d98933a29473c8c33..0000000000000000000000000000000000000000 --- a/esbuild_arm-v2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbdcd7d696db17196c3339b20d21c89729ea98e3b6074e5e6c587700333ebe29 -size 3362037 diff --git a/esbuild_arm-v2.4.0.tar.gz b/esbuild_arm-v2.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..38e3c1c24cdb44a0015f7ec30d86286352abbc48 Binary files /dev/null and b/esbuild_arm-v2.4.0.tar.gz differ diff --git a/esbuild_x86-v2.3.1.tar.gz b/esbuild_x86-v2.3.1.tar.gz deleted file mode 100644 index a5785a4325f8bf05e7e4b396c90e9b4db5fff073..0000000000000000000000000000000000000000 --- a/esbuild_x86-v2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e143fe780ddcad0eaf85db215209192db1078a83b6a1997ded831d8e4d76941 -size 28704 diff --git a/esbuild_x86-v2.4.0.tar.gz b/esbuild_x86-v2.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..72414bf6cedb424a9bd5c936d48ddae105bfe53f Binary files /dev/null and b/esbuild_x86-v2.4.0.tar.gz differ diff --git a/keentune-ui.spec b/keentune-ui.spec index 616fc561ed79bca0bd1da4a84c6986e5775c1c06..f9ae57d6bf55dafc6307c41a8b355289489b4e7b 100644 --- a/keentune-ui.spec +++ b/keentune-ui.spec @@ -1,7 +1,7 @@ -%define anolis_release 2 +%define anolis_release 1 Name: keentune_ui -Version: 2.3.1 +Version: 2.4.0 Release: %{?anolis_release}%{?dist} Summary: KeenTune web UI Vendor: Alibaba @@ -28,8 +28,8 @@ Source3: esbuild_arm-v%{version}.tar.gz BuildArch: noarch -BuildRequires: nodejs -BuildRequires: npm +BuildRequires: nodejs >= 18 +BuildRequires: npm >= 1:6.9 %description KeenTune UI rpm package @@ -43,9 +43,8 @@ else tar -zxvf %{SOURCE3} -C ./node_modules fi - - %build +node --version npm --version npm run build @@ -54,7 +53,6 @@ mkdir -p ${RPM_BUILD_ROOT}/usr/share/keentune/html mkdir -p ${RPM_BUILD_ROOT}/etc/httpd/conf.d mkdir -p ${RPM_BUILD_ROOT}/etc/pki/ssl - cp -rf .htaccess build cp -rf build ${RPM_BUILD_ROOT}/usr/share/keentune/html cp -f keentune*.conf ${RPM_BUILD_ROOT}/etc/httpd/conf.d/ @@ -82,7 +80,6 @@ if [ -f ${httpd_conf} ]; then sed -i ':a;N;$!ba;s%#CustomLog \"logs/access_log\" combined*%CustomLog \"logs/access_log\" combined%' ${httpd_conf} fi - %files %defattr(0644,root,root, 0755) %license LICENSE @@ -93,7 +90,10 @@ fi %{_sysconfdir}/httpd/conf.d %changelog -* Tue Jan 02 2023 happy_orange - 2.3.1-2 +* Mon Jan 22 2024 Runzhe Wang - 2.4.0-1 +- fix bug + +* Tue Jan 02 2024 happy_orange - 2.3.1-2 - fix the version number * Thu Dec 28 2023 Runzhe Wang - 2.3.1-1 diff --git a/node_modules-v2.3.1.tar.gz b/node_modules-v2.3.1.tar.gz deleted file mode 100644 index bea97eca48e4aad620051514172128609f9e252b..0000000000000000000000000000000000000000 --- a/node_modules-v2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcd1401b6efe1520e4c13105491998d3e71f5b7bee15d16931bdd16dcd7cfd6c -size 211570383 diff --git a/node_modules-v2.4.0.tar.gz b/node_modules-v2.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..69fce7c5c12127393fede078e4bbd574ad1050e1 Binary files /dev/null and b/node_modules-v2.4.0.tar.gz differ diff --git a/v2.3.1.tar.gz b/v2.3.1.tar.gz deleted file mode 100644 index 11aa94414c4217065038b80b0e8382d17eb37e4e..0000000000000000000000000000000000000000 --- a/v2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72dead28982f04ae98f634d0148d0009a81670ed2fd009e3a4e31f2eb1da738d -size 181518 diff --git a/v2.4.0.tar.gz b/v2.4.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7862b1479e8c43fdda587ef38a6ea6434f8ad0ca Binary files /dev/null and b/v2.4.0.tar.gz differ