diff --git a/0001-modify-description.patch b/0002-modify-description.patch similarity index 100% rename from 0001-modify-description.patch rename to 0002-modify-description.patch diff --git a/0003-adjust-the-display-sequence.patch b/0003-adjust-the-display-sequence.patch new file mode 100644 index 0000000000000000000000000000000000000000..17b127012d179f904f64c6c9c20aec5e8560f834 --- /dev/null +++ b/0003-adjust-the-display-sequence.patch @@ -0,0 +1,26 @@ +From ae5f25582a87a84cbc33914c27ab66e358ca271f Mon Sep 17 00:00:00 2001 +From: lixin +Date: Tue, 2 Apr 2024 17:13:01 +0800 +Subject: [PATCH] adjust the display sequence + +--- + templates/MT_check_root.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/templates/MT_check_root.html b/templates/MT_check_root.html +index eb4dc3f..cb5d346 100755 +--- a/templates/MT_check_root.html ++++ b/templates/MT_check_root.html +@@ -55,8 +55,8 @@ + +
+ +
+ +-- +2.43.0 + diff --git a/migration-tools.spec b/migration-tools.spec index c3aebd4fbb1646af15b74aba2f912771cc57dd42..97be4cc766fbd205eda7ec3d90b4b8384102ac8e 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,6 +1,6 @@ Name: migration-tools Version: 1.0.1 -Release: 4 +Release: 5 License: MulanPSL-2.0 Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system Source0: migration-tools.tar.gz @@ -8,7 +8,8 @@ Source1: requires.tar.gz Source2: xlwt-1.3.0-py2.py3-none-any.whl # patches Patch0: 0001-use-kill-not-kill-INT-when-stop-service.patch -Patch1: 0001-modify-description.patch +Patch1: 0002-modify-description.patch +Patch2: 0003-adjust-the-display-sequence.patch # CVE patches: >= 100 Patch100: 100-CVE-2024-24892.patch @@ -55,6 +56,7 @@ Migration software server side %patch 0 -p1 %patch 1 -p1 +%patch 2 -p1 %patch 100 -p1 %if 0%{?openEuler} @@ -110,6 +112,9 @@ rm -rf /usr/bin/migration-tools %endif %changelog +* Tue Apr 02 2024 lixin - 1.0.1-5 +- adjust the display sequence + * Mon Apr 01 2024 lixin - 1.0.1-4 - modify description