fix uwsgi path not found issue

0001-fix-uwsgi-path-issue.patch

@@ -1,22 +0,0 @@
-From a35af1f174d5582bc70fc50ccf8a6cfc899286aa Mon Sep 17 00:00:00 2001
-From: hanjinpeng <hanjinpeng@kylinos.cn>
-Date: Wed, 17 Apr 2024 08:49:34 +0800
-Subject: [PATCH] fix uwsgi path issue
-
----
- patch_tracking/patch-tracking | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/patch_tracking/patch-tracking b/patch_tracking/patch-tracking
-index 587f873..d5794be 100755
---- a/patch_tracking/patch-tracking
-+++ b/patch_tracking/patch-tracking
-@@ -8,4 +8,4 @@ settings_file='/etc/patch-tracking/settings.conf'
- 
- server=`grep 'LISTEN' $settings_file | awk -F'=' '{print $2}' | sed -e 's/^[ ]"//g' | sed -e 's/"$//g'`
- 
--/usr/bin/uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy
-+/usr/sbin/uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy
--- 
-2.23.0
-

0001-fix-uwsgi-path-not-found-issue.patch

@@ -0,0 +1,25 @@
+From b756c4d49636d935adab3422b3d7967992b4cfdc Mon Sep 17 00:00:00 2001
+From: hanjinpeng <hanjinpeng@kylinos.cn>
+Date: Tue, 7 May 2024 11:05:48 +0800
+Subject: [PATCH] fix uwsgi path not found issue
+
+---
+ patch_tracking/patch-tracking | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/patch_tracking/patch-tracking b/patch_tracking/patch-tracking
+index f5961fc..b0f4fce 100755
+--- a/patch_tracking/patch-tracking
++++ b/patch_tracking/patch-tracking
+@@ -8,4 +8,7 @@ settings_file='/etc/patch-tracking/settings.conf'
+ 
+ server=`grep 'LISTEN' $settings_file | awk -F'=' '{print $2}' | sed -e 's/^[ ]"//g' | sed -e 's/"$//g'`
+ 
+-/usr/local/bin/uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy
++echo $PATH | grep -q -E "/usr/bin"  ||  PATH=$PATH:/usr/bin
++echo $PATH | grep -q -E "/usr/sbin" ||  PATH=$PATH:/usr/sbin
++
++uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy
+-- 
+2.43.0
+

fix-uwsgi-not-found.patch

@@ -1,9 +0,0 @@
-diff --color -Nur a/patch_tracking/patch-tracking b/patch_tracking/patch-tracking
---- a/patch_tracking/patch-tracking	2020-09-07 18:26:52.000000000 +0800
-+++ b/patch_tracking/patch-tracking	2022-03-07 19:54:18.156108927 +0800
-@@ -8,4 +8,4 @@
- 
- server=`grep 'LISTEN' $settings_file | awk -F'=' '{print $2}' | sed -e 's/^[ ]"//g' | sed -e 's/"$//g'`
- 
--/usr/local/bin/uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy
-+/usr/bin/uwsgi --master --https "${server},/etc/patch-tracking/self-signed.crt,/etc/patch-tracking/self-signed.key" --wsgi-file "${app_file}" --callable app --chdir "${chdir_path}" --threads 100 --lazy

patch-tracking.spec

@@ -1,16 +1,14 @@
 Summary:    This is a tool for automatically tracking upstream repository code patches
 Name:       patch-tracking
 Version:    1.0.1
-Release:    5
+Release:    6
 License:    Mulan PSL v2
 URL:        https://gitee.com/openeuler/openEuler-Advisor
 Source0:    patch-tracking-%{version}.tar
-Patch0000:  fix-uwsgi-not-found.patch
+Patch0:     0001-fix-uwsgi-path-not-found-issue.patch
-Patch0001:  0001-fix-uwsgi-path-issue.patch
 
 BuildArch:  noarch
 
-
 BuildRequires: python3-setuptools systemd
 Requires: python3-uWSGI python3-flask python3-Flask-SQLAlchemy python3-pandas
 Requires: python3-Flask-APScheduler python3-Flask-HTTPAuth python3-requests git
@@ -21,7 +19,6 @@ This is a tool for automatically tracking upstream repository code patches
 %prep
 %setup -n patch-tracking-%{version}
 %patch0 -p1
-%patch0001 -p1
 
 %build
 %py3_build
@@ -56,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 7 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 1.0.1-6
+- Fix uwsgi not found issue, Use the path environment variable to run the uwsgi command
+
 * Wed Apr 17 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 1.0.1-5
 - Fix uwsgi path issue to ensure patch-tracking service start up success