diff --git a/oedp/build/build.sh b/oedp/build/build.sh index a227b6af169ffbd4df1e5f641247bd24cf2fc8a3..b59d30a5a5f25564b54236f56c953c2e9c8570c1 100644 --- a/oedp/build/build.sh +++ b/oedp/build/build.sh @@ -37,8 +37,8 @@ cd "${WORKSPACE_DIR}" [ ! -d "${STORAGE_DIR}" ] && mkdir "${STORAGE_DIR}" sub_dir=$(date +'%Y%m%d%H%M') mkdir "${STORAGE_DIR}/${sub_dir}" -cp -f ~/rpmbuild/RPMS/$(arch)/*.rpm "${STORAGE_DIR}/${sub_dir}" -rpm_name=$(ls ~/rpmbuild/RPMS/$(arch)) +find ~/rpmbuild/RPMS/ -type f -exec cp -f {} "${STORAGE_DIR}/${sub_dir}" \; +rpm_name=$(ls "${STORAGE_DIR}/${sub_dir}") echo -e "\e[1;32m [INFO] RPM is stored in ${STORAGE_DIR}/${sub_dir}/${rpm_name} \e[0m" echo -e "\e[1;32m [INFO] Start to clean up environment \e[0m" diff --git a/oedp/build/constants.sh b/oedp/build/constants.sh index 66a83278ef11cacbc2c98887a6b14ac098c38146..dfe880dfadb1f97e17906abe56f5de9c9c01659c 100644 --- a/oedp/build/constants.sh +++ b/oedp/build/constants.sh @@ -26,5 +26,5 @@ BUILD_SCRIPT_DIR="${PROJECT_DIR}"/build # 存放构建中间产物的暂存目录 TEMP_DIR="${PROJECT_DIR}"/temp # 打包目录 -PACKING_DIR_NAME=oedp-1.0.0 +PACKING_DIR_NAME=oedp-1.0.1 PACKING_DIR="${TEMP_DIR}/${PACKING_DIR_NAME}" \ No newline at end of file diff --git a/oedp/build/oedp.spec b/oedp/build/oedp.spec index e04043a5562a1cfa0aeb4870921a67a0fe09e84f..6b23f60d9f329402dc63b51e71f691800b69d712 100644 --- a/oedp/build/oedp.spec +++ b/oedp/build/oedp.spec @@ -1,11 +1,13 @@ %define _python_bytecompile_errors_terminate_build 0 Name: oedp -Version: 1.0.0 +Version: 1.0.1 Release: release_number Summary: openEuler deploy tool License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz +BuildArch: noarch + Requires: python3, ansible, python3-prettytable %description @@ -57,4 +59,18 @@ fi %attr(0500,root,root) %{_usr}/lib/oedp/src/* %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/oedp/config/log.conf %attr(0755,root,root) %{_usr}/share/applications/* -%attr(0500,root,root) %{_bindir}/oedp \ No newline at end of file +%attr(0500,root,root) %{_bindir}/oedp + + +%changelog +* Wed Mar 12 2025 Liu Jiangbin - 1.0.1-1 +- Updated icon click effects on DevStation. +- Added upgrade support for the oedp package. +- Fixed exceptions caused by missing 'tasks' field. +- Fixed other known issues. + +* Mon Mar 3 2025 Liu Jiangbin - 1.0.0-2 +- fix the issue of abnormal termination during the script execution phase after installation + +* Sat Feb 22 2025 Liu Jiangbin - 1.0.0-1 +- init package \ No newline at end of file diff --git a/oedp/build/static/oeDeploy.desktop b/oedp/build/static/oeDeploy.desktop index 84ee54929d6ac9b48c47e9709812cf59fbb56059..251ebcfd5f0ed628e06a8c3dd2d358e66257618f 100644 --- a/oedp/build/static/oeDeploy.desktop +++ b/oedp/build/static/oeDeploy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.0.0 +Version=1.0.1 Type=Application Name=oeDeploy Exec=xdg-open /usr/share/applications/oeDeploy.html