From c2bc9453fead8de112a000bf21568c2ec74f2638 Mon Sep 17 00:00:00 2001
From: abc <abc@163.com>
Date: Wed, 8 Mar 2023 08:09:35 +0800
Subject: [PATCH] update spec and patch file

---
 devkit-kunpeng-porting.spec  | 28 +++++++++++++++++++++-------
 remove-the-interaction.patch | 27 +++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/devkit-kunpeng-porting.spec b/devkit-kunpeng-porting.spec
index 1a0d218..b01e8b4 100644
--- a/devkit-kunpeng-porting.spec
+++ b/devkit-kunpeng-porting.spec
@@ -1,9 +1,9 @@
 %define debug_package %{nil}
 
-Name:           kunpeng-porting-advisor
+Name:           devkit-porting-advisor
 Version:        2.5.0
 Release:        1
-Summary:        kunpeng porting advisor
+Summary:        devkit porting advisor
 License:        GPL
 
 BuildRequires:  gcc
@@ -18,14 +18,32 @@ echo "prep..."
 
 %build
 echo "build..."
+TempPortingDir=%{_sourcedir}/temp-porting-dir
+mkdir -p ${TempPortingDir}
+
+echo "download package..."
 cd %{_sourcedir}
 wget https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Porting%20Advisor/Porting%20Advisor%202.5.0/Porting-advisor_2.5.0_linux-Kunpeng.tar.gz
+tar -xf Porting-advisor_2.5.0_linux-Kunpeng.tar.gz 
+cd %{_sourcedir}/Porting-advisor_2.5.0_linux-Kunpeng
+tar -xf Porting-advisor_2.5.0_linux-Kunpeng.tar.gz
+cp -rf %{_sourcedir}/Porting-advisor_2.5.0_linux-Kunpeng/Porting-advisor_2.5.0_linux-Kunpeng ${TempPortingDir}
+cd ${TempPortingDir}/Porting-advisor_2.5.0_linux-Kunpeng
+
+echo "patch..."
+PatchPath=%{_sourcedir}/remove-the-interaction.patch
+patch -p1 < ${PatchPath}
+cp %{_sourcedir}/Porting-advisor_2.5.0_linux-Kunpeng/cms ${TempPortingDir}/Porting-advisor_2.5.0_linux-Kunpeng
+cd ${TempPortingDir}
+tar -zcf Porting-advisor_2.5.0_linux-Kunpeng.tar.gz ./Porting-advisor_2.5.0_linux-Kunpeng
+ls ${TempPortingDir}
+rm -rf ${TempPortingDir}/Porting-advisor_2.5.0_linux-Kunpeng
 
 %install
 echo "install..."
 PortingDir=$RPM_BUILD_ROOT/home/devkit-porting
 mkdir -p ${PortingDir}
-cp %{_sourcedir}/Porting-advisor_2.5.0_linux-Kunpeng.tar.gz ${PortingDir}
+cp %{_sourcedir}/temp-porting-dir/Porting-advisor_2.5.0_linux-Kunpeng.tar.gz ${PortingDir}
 
 %files
 /home/devkit-porting/Porting-advisor_2.5.0_linux-Kunpeng.tar.gz
@@ -39,15 +57,11 @@ echo "pre install..."
 echo "post install..."
 PortingDir=/home/devkit-porting
 PortingInstallDir=${PortingDir}/Porting-advisor_2.5.0_linux-Kunpeng
-PortingEndInstallDir=${PortingDir}/Porting-advisor_2.5.0_linux-Kunpeng/Porting-advisor_2.5.0_linux-Kunpeng
 
 cd ${PortingDir}
 tar -xf Porting-advisor_2.5.0_linux-Kunpeng.tar.gz
 
 cd ${PortingInstallDir}
-tar -xf Porting-advisor_2.5.0_linux-Kunpeng.tar.gz
-cd ${PortingEndInstallDir}
-git am %{_specdir}/remove-the-interaction.patch
 bash .install.sh web
 
 %preun
diff --git a/remove-the-interaction.patch b/remove-the-interaction.patch
index 923fd1f..ccf4f74 100644
--- a/remove-the-interaction.patch
+++ b/remove-the-interaction.patch
@@ -1,9 +1,11 @@
-From 6fa554432e1f0b3ed42439e82e3a5f87adf5aa6c Mon Sep 17 00:00:00 2001
+From f6dee7407acf7dd75df62e071371b72b22b483fb Mon Sep 17 00:00:00 2001
 From: abc <abc@163.com>
-Date: Tue, 7 Mar 2023 11:05:52 +0800
-Subject: [PATCH] remove the interaction
+Date: Wed, 8 Mar 2023 07:37:21 +0800
+Subject: [PATCH] new package
 
 ---
+ .install.sh          |   2 +
+ .upgrade.sh          |   0
  check_install_env.sh |  29 ++-----
  common_func.sh       |  57 ++++++--------
  common_path.sh       |  47 ++----------
@@ -11,9 +13,26 @@ Subject: [PATCH] remove the interaction
  install_webfunc.sh   | 179 ++++---------------------------------------
  start_install.sh     |   2 +-
  uninstall.sh         |  51 ------------
- 7 files changed, 52 insertions(+), 316 deletions(-)
+ 9 files changed, 54 insertions(+), 316 deletions(-)
+ mode change 100755 => 100644 .install.sh
+ mode change 100755 => 100644 .upgrade.sh
  mode change 100755 => 100644 uninstall.sh
 
+diff --git a/.install.sh b/.install.sh
+old mode 100755
+new mode 100644
+index daae2ee..98bcd97
+--- a/.install.sh
++++ b/.install.sh
+@@ -100,3 +100,5 @@ install_main(){
+         return 0
+     fi
+ }
++
++install_main $1
+diff --git a/.upgrade.sh b/.upgrade.sh
+old mode 100755
+new mode 100644
 diff --git a/check_install_env.sh b/check_install_env.sh
 index 5a5f252..d963e6c 100644
 --- a/check_install_env.sh
-- 
Gitee