diff --git a/pkgship-1.1.0.tar.gz b/pkgship-1.1.0.tar.gz index 13ea9c3..1608342 100644 Binary files a/pkgship-1.1.0.tar.gz and b/pkgship-1.1.0.tar.gz differ diff --git a/pkgship.spec b/pkgship.spec index 022423d..8a7adbc 100755 --- a/pkgship.spec +++ b/pkgship.spec @@ -1,6 +1,6 @@ Name: pkgship Version: 1.1.0 -Release: 1 +Release: 2 Summary: Pkgship implements rpm package dependence ,maintainer, patch query and so no. License: Mulan 2.0 URL: https://gitee.com/openeuler/openEuler-Advisor @@ -13,7 +13,7 @@ BuildRequires: python3-prettytable python3-requests python3-flask-session python BuildRequires: python3-Flask-APScheduler python3-pandas python3-retrying python3-xlrd python3-XlsxWriter Requires: python3-pip python3-flask-restful python3-flask python3 python3-pyyaml Requires: python3-sqlalchemy python3-prettytable python3-requests -Requires: python3-pyinstaller python3-flask-session python3-flask-script python3-marshmallow python3-uWSGI +Requires: python3-flask-session python3-flask-script python3-marshmallow python3-uWSGI Requires: python3-pandas python3-dateutil python3-XlsxWriter python3-xlrd python3-Flask-APScheduler python3-retrying %description @@ -41,27 +41,6 @@ sed -i "/\[LOG\]/a\log_path=$log_path" test/common_files/package.ini rm -rf $log_path %post -#build cli bin -if [ -f "/usr/bin/pkgship" ]; then - rm -rf /usr/bin/pkgship -fi - - -cd %{python3_sitelib}/packageship/ -if [ -f "/usr/bin/pyinstaller" ]; then - path=/usr/bin/pyinstaller -elif [ -f "/usr/local/bin/pyinstaller" ]; then - 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 -$path pkgship.spec -cp dist/pkgship /usr/bin/ -rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist %postun @@ -71,9 +50,13 @@ rm -rf %{python3_sitelib}/packageship/build %{python3_sitelib}/packageship/dist %{python3_sitelib}/* %config %{_sysconfdir}/pkgship/* %attr(0755,root,root) %{_bindir}/pkgshipd - +%attr(0755,root,root) %{_bindir}/pkgship %changelog +* Tue Sep 1 2020 Zhengtang Gong - 1.1.0-2 +- Delete the packaged form of pyinstaller and change the execution + of the command in the form of a single file as the input + * Sat Aug 29 2020 Yiru Wang - 1.1.0-1 - Add package management features: RPM packages statically displayed in the version repository