diff --git a/uwsgi.service b/uwsgi.service index dec058d3f9af6806962a116eebbb0bacb24af979..68613fada01b337b6e68b969c4d1ccca3b2a98a3 100644 --- a/uwsgi.service +++ b/uwsgi.service @@ -4,7 +4,7 @@ After=syslog.target [Service] EnvironmentFile=-/etc/sysconfig/uwsgi -ExecStart=/usr/sbin/uwsgi --ini /etc/uwsgi.ini --pidfile /run/uwsgi/uwsgi.pid --stats /run/uwsgi/stats.sock +ExecStart=/usr/bin/uwsgi --ini /etc/uwsgi.ini --pidfile /run/uwsgi/uwsgi.pid --stats /run/uwsgi/stats.sock ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGINT Restart=always diff --git a/uwsgi.spec b/uwsgi.spec index a6e2aa16683eca8beba8d38922d9d98626e1321f..e9646de1ef2fd6c98e7b206a91296546f3638706 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -65,7 +65,7 @@ Name: uwsgi Version: 2.0.23 -Release: 1 +Release: 2 Summary: Fast, self-healing, application container server # uwsgi is licensed under GPLv2 with a linking exception # docs are licensed under MIT @@ -1020,6 +1020,7 @@ cp -p %{SOURCE5} README.openEuler %build CFLAGS="%{optflags} -Wno-error -Wno-unused-but-set-variable -fPIC" %{__python} uwsgiconfig.py --verbose --build openEuler.ini %if %{with python3} +%py3_build CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/python openEuler python%{python3_pkgversion} CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/gevent openEuler python%{python3_pkgversion}_gevent CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3} uwsgiconfig.py --verbose --plugin plugins/tornado openEuler python%{python3_pkgversion}_tornado @@ -1111,13 +1112,12 @@ tar -C %{buildroot}%{_usrsrc}/uwsgi/%{version} --strip-components=1 -xvzf %{SOUR cp %{SOURCE1} %{buildroot}%{_usrsrc}/uwsgi/%{version}/buildconf/ cp docs/Changelog-%{version}.rst CHANGELOG rm -f docs/.gitignore -echo "%{commit}, i.e. this:" >> README.Fedora -echo "https://github.com/unbit/%{docrepo}/tree/%{commit}" >> README.Fedora -install -D -p -m 0755 uwsgi %{buildroot}%{_sbindir}/uwsgi +echo "%{commit}, i.e. this:" >> README.openEuler +echo "https://github.com/unbit/%{docrepo}/tree/%{commit}" >> README.openEuler install -p -m 0644 *.h %{buildroot}%{_includedir}/uwsgi install -p -m 0755 *_plugin.so %{buildroot}%{_libdir}/uwsgi %if %{with python3} -install -D -p -m 0644 uwsgidecorators.py %{buildroot}%{python3_sitelib}/uwsgidecorators.py +%py3_install %if %{manual_py_compile} == 1 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/uwsgidecorators.py %endif @@ -1154,12 +1154,12 @@ exit 0 %files -%{_sbindir}/uwsgi +%{_bindir}/uwsgi %config(noreplace) %{_sysconfdir}/uwsgi.ini %{_unitdir}/uwsgi.service %{_tmpfilesdir}/uwsgi.conf %dir %{_sysconfdir}/uwsgi.d -%doc README README.Fedora CHANGELOG +%doc README README.openEuler CHANGELOG %license LICENSE %files -n uwsgi-devel @@ -1169,6 +1169,7 @@ exit 0 %if %{with python3} %files -n python%{python3_pkgversion}-uwsgidecorators %{python3_sitelib}/uwsgidecorators.py +%{python3_sitelib}/uWSGI-%{version}-py3.11.egg-info/* %{python3_sitelib}/__pycache__/uwsgidecorators.cpython-%{python3_version_nodots}*.py* %endif @@ -1541,6 +1542,9 @@ exit 0 %changelog +* Wed Apr 17 2024 wulei - 2.0.23-2 +- Fix pkgship service startup failure + * Thu Jan 18 2024 wangkai <13474090681@163.com> - 2.0.23-1 - Update to 2.0.23 and add plugin rpm packages