From 684b8bf9ad50dd3638358f2c004b9e504bfe6b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=84=E7=9A=AE=E5=B0=8F=E7=AC=BC=E5=8C=85?=
 <wangyiru1@huawei.com>
Date: Tue, 1 Sep 2020 11:33:28 +0800
Subject: [PATCH] change spec file for 1.1.0 building

---
 packageship/packageship/pkgshipd |  8 +++++---
 packageship/pkgship.spec         | 17 ++++++++++++-----
 packageship/setup.py             |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packageship/packageship/pkgshipd b/packageship/packageship/pkgshipd
index a2e39a4f..c6e742f0 100755
--- a/packageship/packageship/pkgshipd
+++ b/packageship/packageship/pkgshipd
@@ -45,6 +45,7 @@ buffer-size=$buffer_size
 pidfile=$OUT_PATH/manage.pid
 http-timeout=$http_timeout
 harakiri=$harakiri
+enable-threads=true
 daemonize=$daemonize" > $OUT_PATH/manage.ini
     fi
     
@@ -72,6 +73,7 @@ buffer-size=$buffer_size
 pidfile=$OUT_PATH/selfpkg.pid
 http-timeout=$http_timeout
 harakiri=$harakiri
+enable-threads=true
 daemonize=$daemonize" > $OUT_PATH/selfpkg.ini
 
     fi
@@ -107,8 +109,8 @@ function stop_service(){
 
 if [ ! -n "$1" ]
 then
-	echo "Usages: sh pkgshipd.sh start|stop|restart [manage|selfpkg]"
-	exit 0
+    echo "Usages: sh pkgshipd.sh start|stop|restart [manage|selfpkg]"
+    exit 0
 fi
 
 if [ X$2 = X ];then
@@ -154,6 +156,6 @@ elif [ $1 = restart ];then
     echo "===The run log is saved into: $daemonize==="
 
 else
-	echo "Usages: sh pkgshipd.sh start|stop|restart [manage|selfpkg]"
+    echo "Usages: sh pkgshipd.sh start|stop|restart [manage|selfpkg]"
 fi
 
diff --git a/packageship/pkgship.spec b/packageship/pkgship.spec
index 2d8f7bf9..022423d7 100644
--- a/packageship/pkgship.spec
+++ b/packageship/pkgship.spec
@@ -1,6 +1,6 @@
 Name:           pkgship
-Version:        1.0.0
-Release:        7
+Version:        1.1.0
+Release:        1
 Summary:        Pkgship implements rpm package dependence ,maintainer, patch query and so no.
 License:        Mulan 2.0
 URL:            https://gitee.com/openeuler/openEuler-Advisor
@@ -30,6 +30,7 @@ Pkgship implements rpm package dependence ,maintainer, patch query and so no.
 
 
 %check
+# The apscheduler cannot catch the local time, so a time zone must be assigned before running the test case.
 export TZ=Asia/Shanghai
 # change log_path to solve default log_path permission denied problem
 log_path=`pwd`/tmp/
@@ -48,16 +49,17 @@ fi
 
 cd %{python3_sitelib}/packageship/
 if [ -f "/usr/bin/pyinstaller" ]; then
-    /usr/bin/pyinstaller -F pkgship.py
+    path=/usr/bin/pyinstaller
 elif [ -f "/usr/local/bin/pyinstaller" ]; then
-    /usr/local/bin/pyinstaller -F pkgship.py
+    path=/usr/local/bin/pyinstaller
 else
     echo "pkship install fail,there is no pyinstaller!"
     exit
 fi
 
+$path -F pkgship.py
 sed -i "s/hiddenimports\=\[\]/hiddenimports\=\['pkg_resources.py2_warn'\]/g" pkgship.spec
-/usr/local/bin/pyinstaller pkgship.spec
+$path pkgship.spec
 cp dist/pkgship /usr/bin/
 rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist
 
@@ -72,6 +74,11 @@ rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist
 
 
 %changelog
+* Sat Aug 29 2020 Yiru Wang <wangyiru1@huawei.com> - 1.1.0-1
+- Add package management features:
+  RPM packages statically displayed in the version repository
+  RPM packages used time displayed for current version in the version repository
+  Issue management of packages in a version-management repository
 
 * Fri Aug 21 2020 Chengqiang Bao < baochengqiang1@huawei.com > - 1.0.0-7
 - Fixed a problem with command line initialization of the Filepath parameter where relative paths are not supported and paths are too long
diff --git a/packageship/setup.py b/packageship/setup.py
index 08488d7d..9616ed5c 100644
--- a/packageship/setup.py
+++ b/packageship/setup.py
@@ -28,6 +28,7 @@ setup(
         'packageship.application.apps.lifecycle.function.base',
         'packageship.application.apps.lifecycle.function.download_yaml',
         'packageship.application.apps.lifecycle.function.gitee',
+        'packageship.application.apps.lifecycle.function.concurrent',
         'packageship.application.apps.lifecycle.serialize',
         'packageship.application.apps.lifecycle.url',
         'packageship.application.apps.lifecycle.view',
-- 
Gitee