From 6f993aa0d79f8f1a7042f8a8308542db8c32260b Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 22 Sep 2024 19:13:00 +0200 Subject: [PATCH] remove and obsolete python 3.10 plugin [release 2.0.26-2mamba;Sun Sep 22 2024] --- uwsgi.spec | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/uwsgi.spec b/uwsgi.spec index 65253ab..eaa86b1 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -1,6 +1,6 @@ Name: uwsgi Version: 2.0.26 -Release: 1mamba +Release: 2mamba Summary: A full stack for building hosting services Group: System/Servers Vendor: openmamba @@ -38,7 +38,6 @@ BuildRequires: libpam-devel BuildRequires: libpcre2-devel BuildRequires: libperl BuildRequires: libpython3-devel -BuildRequires: libpython310-devel BuildRequires: libpython311-devel BuildRequires: libruby-devel BuildRequires: libstdc++6-devel @@ -49,7 +48,7 @@ BuildRequires: libxml2-devel BuildRequires: libz-devel BuildRequires: mono-devel ## AUTOBUILDREQ-END -BuildRequires: python-greenlet-py310 +BuildRequires: python-greenlet-py3 %description A full stack for building hosting services. @@ -86,6 +85,7 @@ Summary: Python plugin for %{name} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: python3 Requires: python-greenlet-py3 +Obsoletes: uwsgi-plugin-python310 <= 2.0.26-1mamba %description plugin-python This package contains the Python plugin for %{name}. @@ -98,16 +98,6 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description plugin-pypy This package contains the Pypy plugin for %{name}. -%package plugin-python310 -Group: System/Libraries -Summary: Python 3.10 plugin for %{name} -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: python310 -Requires: python-greenlet-py310 - -%description plugin-python310 -This package contains the Python 3.10 plugin for %{name}. - %package plugin-lua Group: System/Libraries Summary: LUA plugin for %{name} @@ -176,8 +166,6 @@ sed -i "s|ld_run_path = None|ld_run_path = '%{_libdir}/apache'|" plugins/php/uws export UWSGICONFIG_PHPLIBDIR=%{_libdir}/apache/libphp7.so %make PYTHON=%{__python3} PROFILE=openmamba -PYTHON=%{__python310} ./uwsgi --build-plugin "plugins/python python310" - %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -199,11 +187,6 @@ install -D -m0644 uwsgidecorators.py %{buildroot}%{python3_sitearch}/uwsgidecora %{__python3} -m compileall %{buildroot}%{python3_sitearch} %{__python3} -O -m compileall %{buildroot}%{python3_sitearch} -# Python 3.10 -install -D -m0644 uwsgidecorators.py %{buildroot}%{python310_sitearch}/uwsgidecorators.py -%{__python310} -m compileall %{buildroot}%{python310_sitearch} -%{__python310} -O -m compileall %{buildroot}%{python310_sitearch} - # Pypy install -D -m0644 uwsgidecorators.py %{buildroot}/opt/pypy/site-packages/uwsgidecorators.py %{__python3} -m compileall %{buildroot}/opt/pypy/site-packages @@ -257,15 +240,6 @@ install -D -m0755 plugins/mono/uwsgi.dll %{buildroot}%{_prefix}/lib/mono/2.0/uws /opt/pypy/site-packages/uwsgidecorators.py /opt/pypy/site-packages/__pycache__/uwsgidecorators.cpython*pyc -%files plugin-python310 -%defattr(-,root,root) -%{_libdir}/uwsgi/asyncio_plugin.so -%{_libdir}/uwsgi/gevent_plugin.so -%{_libdir}/uwsgi/greenlet_plugin.so -%{_libdir}/uwsgi/python310_plugin.so -%{python310_sitearch}/uwsgidecorators.py -%{python310_sitearch}/__pycache__/uwsgidecorators.cpython*pyc - %files plugin-lua %defattr(-,root,root) %{_libdir}/uwsgi/lua_plugin.so @@ -292,6 +266,9 @@ install -D -m0755 plugins/mono/uwsgi.dll %{buildroot}%{_prefix}/lib/mono/2.0/uws %{_libdir}/uwsgi/notfound_plugin.so %changelog +* Sun Sep 22 2024 Silvan Calarco 2.0.26-2mamba +- remove and obsolete python 3.10 plugin + * Sun Jun 02 2024 Automatic Build System 2.0.26-1mamba - automatic version update by autodist