Compare commits

..

No commits in common. "rawhide" and "f42" have entirely different histories.

3 changed files with 10 additions and 114 deletions

2
.gitignore vendored
View file

@ -68,5 +68,3 @@
/uwsgi-docs-b9da5ea.tar.gz
/2.0.30.tar.gz
/uwsgi-docs-f728a25.tar.gz
/uwsgi-docs-5784c30.tar.gz
/2.0.31.tar.gz

View file

@ -1,2 +1,2 @@
SHA512 (uwsgi-docs-5784c30.tar.gz) = 4f966da4a867e45043a0eb4a123b439c8ab1f7ce6e8b32d770545ff7fae586e4e7dd011106aa6ed0ec82a6c6192937e0fd12ed681443332205566fc329e11cd8
SHA512 (2.0.31.tar.gz) = d4d327f36455438e165298cb5a7d483c951f4acd3d834b46ceeda105bd3664792ead226b02e06db62e92c210544778119bf75a55d9d4f30f8fba896c7de51e6d
SHA512 (2.0.30.tar.gz) = a8ff667e55956285427d440cf40c552ad6628c192e3b4d0a3d8d5f96aec09c18466feb64f4b305d84194a7d5e2bb15a49a1d6b807af538e474e72867ceb7f644
SHA512 (uwsgi-docs-f728a25.tar.gz) = d9c43572ea325fc841b929d82f24fd2ec6e798899b7f0d2a74936ad51967f71c09d759f1a2cfb7708a2f9828ac46d06c50c81c9a72828c160231fa281f317415

View file

@ -1,5 +1,5 @@
# Documentation sources:
%global commit 5784c30866a94942a5200db4d5f6c2850afb1caa
%global commit f728a2505313a928413af07720db7b261e8adcd4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global docrepo uwsgi-docs
@ -26,7 +26,7 @@
%bcond_without tuntap
%bcond_without zeromq
%bcond_without perl
%bcond_with perlcoro
%bcond_without perlcoro
%bcond_without glusterfs
%bcond_without php
%bcond_without pq
@ -148,7 +148,7 @@
%if %{with python3_alternate1}
%global python3_alternate1_pkgname python3.11
%global __python3_alternate1 python3.11
%global python3_alternate1_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate1} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
%global python3_alternate1_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate1} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")}
%global python3_alternate1_version 3.11
%global python3_alternate1_version_nodots 311
%endif
@ -156,18 +156,10 @@
%if %{with python3_alternate2}
%global python3_alternate2_pkgname python3.12
%global __python3_alternate2 python3.12
%global python3_alternate2_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate2} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
%global python3_alternate2_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate2} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")}
%global python3_alternate2_version 3.12
%global python3_alternate2_version_nodots 312
%endif
%bcond_without python3_alternate3
%if %{with python3_alternate3}
%global python3_alternate3_pkgname python3.13
%global __python3_alternate3 python3.13
%global python3_alternate3_sitelib %(RPM_BUILD_ROOT= %{__python3_alternate3} -Ic "import sysconfig; print(sysconfig.get_path('purelib', vars={'platbase': '%{_prefix}', 'base': '%{_prefix}'}))")
%global python3_alternate3_version 3.13
%global python3_alternate3_version_nodots 313
%endif
#EL9 endif
%endif
@ -247,9 +239,6 @@
%if %{with python3_alternate2}
%global __python %{__python3_alternate2}
%else
%if %{with python3_alternate3}
%global __python %{__python3_alternate3}
%else
%if %{with python2}
%global __python %{__python2}
%else
@ -258,11 +247,10 @@
%endif
%endif
%endif
%endif
Name: uwsgi
Version: 2.0.31
Release: 5%{?dist}
Version: 2.0.30
Release: 1%{?dist}
Summary: Fast, self-healing, application container server
# uwsgi is licensed under GPLv2 with a linking exception
# docs are licensed under MIT
@ -293,6 +281,7 @@ Patch6: uwsgi_v8-314_compatibility.patch
Patch7: uwsgi_fix_mono.patch
Patch13: uwsgi_fix_chroot_chdir.patch
Patch14: uwsgi_python312-2.patch
Patch15: uwsgi_gcc15-signal-handler.patch
BuildRequires: curl, libxml2-devel, libuuid-devel, jansson-devel
BuildRequires: libyaml-devel, ruby-devel
@ -318,9 +307,6 @@ BuildRequires: %{python3_alternate1_pkgname}-devel
%if %{with python3_alternate2}
BuildRequires: %{python3_alternate2_pkgname}-devel
%endif
%if %{with python3_alternate3}
BuildRequires: %{python3_alternate3_pkgname}-devel
%endif
%if %{with glusterfs}
BuildRequires: glusterfs-devel, glusterfs-api-devel
%endif
@ -465,17 +451,6 @@ The uwsgidecorators Python %{python3_alternate2_version} module provides
higher-level access to the uWSGI API.
%endif
%if %{with python3_alternate3}
%package -n %{python3_alternate3_pkgname}-uwsgidecorators
Summary: Python %{python3_alternate3_version} decorators providing access to the uwsgi API
Requires: uwsgi = %{version}-%{release}
Requires: uwsgi-plugin-python%{python3_alternate3_version_nodots} = %{version}-%{release}
%description -n %{python3_alternate3_pkgname}-uwsgidecorators
The uwsgidecorators Python %{python3_alternate3_version} module provides
higher-level access to the uWSGI API.
%endif
%package -n uwsgi-docs
Summary: uWSGI - Documentation
Requires: uwsgi
@ -835,15 +810,6 @@ Requires: uwsgi-plugin-python%{python3_alternate2_version_nodots} = %{version}-%
This package contains the Python %{python3_alternate2_version} gevent plugin for uWSGI
%endif
%if %{with python3_alternate3}
%package -n uwsgi-plugin-python%{python3_alternate3_version_nodots}-gevent
Summary: uWSGI - Plugin for Python %{python3_alternate3_version} GEvent support
Requires: uwsgi-plugin-python%{python3_alternate3_version_nodots} = %{version}-%{release}, libevent
%description -n uwsgi-plugin-python%{python3_alternate3_version_nodots}-gevent
This package contains the Python %{python3_alternate3_version} gevent plugin for uWSGI
%endif
%if %{with glusterfs}
%package -n uwsgi-plugin-glusterfs
Summary: uWSGI - Plugin for GlusterFS support
@ -1012,15 +978,6 @@ Requires: %{python3_alternate2_pkgname}, uwsgi-plugin-common = %{version}-%{rele
This package contains the Python %{python3_alternate2_version} plugin for uWSGI
%endif
%if %{with python3_alternate3}
%package -n uwsgi-plugin-python%{python3_alternate3_version_nodots}
Summary: uWSGI - Plugin for Python %{python3_alternate3_version} support
Requires: %{python3_alternate3_pkgname}, uwsgi-plugin-common = %{version}-%{release}
%description -n uwsgi-plugin-python%{python3_alternate3_version_nodots}
This package contains the Python %{python3_alternate3_version} plugin for uWSGI
%endif
%if %{with ruby_rack}
%package -n uwsgi-plugin-rack
Summary: uWSGI - Ruby rack plugin
@ -1384,6 +1341,7 @@ cp -p %{SOURCE5} README.Fedora
%endif
%patch -P13 -p1
%patch -P14 -p1
%patch -P15 -p1
%build
CFLAGS="%{optflags} -Wno-error -Wno-unused-but-set-variable -fPIC" %{__python} uwsgiconfig.py --verbose --build fedora.ini
@ -1405,10 +1363,6 @@ CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3_alternate1} uwsgic
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3_alternate2} uwsgiconfig.py --verbose --plugin plugins/python fedora python%{python3_alternate2_version_nodots}
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3_alternate2} uwsgiconfig.py --verbose --plugin plugins/gevent fedora python%{python3_alternate2_version_nodots}_gevent
%endif
%if %{with python3_alternate3}
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3_alternate3} uwsgiconfig.py --verbose --plugin plugins/python fedora python%{python3_alternate3_version_nodots}
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python3_alternate3} uwsgiconfig.py --verbose --plugin plugins/gevent fedora python%{python3_alternate3_version_nodots}_gevent
%endif
%if %{with mongodblibs}
CFLAGS="%{optflags} -Wno-unused-but-set-variable" %{__python} uwsgiconfig.py --verbose --plugin plugins/mongodblog fedora
CFLAGS="%{optflags} -Wno-unused-but-set-variable -std=gnu++11 -Wno-error" %{__python2} uwsgiconfig.py --verbose --plugin plugins/stats_pusher_mongodb fedora
@ -1533,12 +1487,6 @@ install -D -p -m 0644 uwsgidecorators.py %{buildroot}%{python3_alternate2_siteli
%py_byte_compile %{__python3_alternate2} %{buildroot}%{python3_alternate2_sitelib}/uwsgidecorators.py
%endif
%endif
%if %{with python3_alternate3}
install -D -p -m 0644 uwsgidecorators.py %{buildroot}%{python3_alternate3_sitelib}/uwsgidecorators.py
%if %{manual_py_compile} == 1
%py_byte_compile %{__python3_alternate3} %{buildroot}%{python3_alternate3_sitelib}/uwsgidecorators.py
%endif
%endif
%if %{with java}
install -D -p -m 0644 plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar
%endif
@ -1601,12 +1549,6 @@ install -m0644 -D %{SOURCE8} %{buildroot}%{_sysusersdir}/uwsgi.conf
%{python3_alternate2_sitelib}/__pycache__/uwsgidecorators.cpython-%{python3_alternate2_version_nodots}*.py*
%endif
%if %{with python3_alternate3}
%files -n %{python3_alternate3_pkgname}-uwsgidecorators
%{python3_alternate3_sitelib}/uwsgidecorators.py
%{python3_alternate3_sitelib}/__pycache__/uwsgidecorators.cpython-%{python3_alternate3_version_nodots}*.py*
%endif
%files -n uwsgi-docs
%doc docs
@ -1779,11 +1721,6 @@ install -m0644 -D %{SOURCE8} %{buildroot}%{_sysusersdir}/uwsgi.conf
%{_libdir}/uwsgi/python%{python3_alternate2_version_nodots}_gevent_plugin.so
%endif
%if %{with python3_alternate3}
%files -n uwsgi-plugin-python%{python3_alternate3_version_nodots}-gevent
%{_libdir}/uwsgi/python%{python3_alternate3_version_nodots}_gevent_plugin.so
%endif
%if %{with glusterfs}
%files -n uwsgi-plugin-glusterfs
%{_libdir}/uwsgi/glusterfs_plugin.so
@ -1868,11 +1805,6 @@ install -m0644 -D %{SOURCE8} %{buildroot}%{_sysusersdir}/uwsgi.conf
%{_libdir}/uwsgi/python%{python3_alternate2_version_nodots}_plugin.so
%endif
%if %{with python3_alternate3}
%files -n uwsgi-plugin-python%{python3_alternate3_version_nodots}
%{_libdir}/uwsgi/python%{python3_alternate3_version_nodots}_plugin.so
%endif
%if %{with ruby_rack}
%files -n uwsgi-plugin-rack
%{_libdir}/uwsgi/rack_plugin.so
@ -2030,40 +1962,6 @@ install -m0644 -D %{SOURCE8} %{buildroot}%{_sysusersdir}/uwsgi.conf
%changelog
* Sun Jan 11 2026 Ralf Ertzinger <ralf@skytale.net> - 2.0.31-5
- Rebuild for new gccgo libraries
* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.0.31-4
- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
* Wed Nov 26 2025 Ralf Ertzinger <ralf@skytale.net> - 2.0.31-3
- Fix path errors for EPEL9 uwsgidecorator packages
* Wed Oct 15 2025 Remi Collet <remi@remirepo.net> - 2.0.31-2
- rebuild for https://fedoraproject.org/wiki/Changes/php85
* Sun Oct 12 2025 Ralf Ertzinger <ralf@skytale.net> - 2.0.31-1
- Update to 2.0.31, drop merged patches
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2.0.30-7
- Rebuilt for Python 3.14.0rc3 bytecode
* Tue Aug 19 2025 Ralf Ertzinger <ralf@skytale.net> - 2.0.30-6
- Add python3.13 module for EL9
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 2.0.30-5
- Rebuilt for Python 3.14.0rc2 bytecode
* Thu Jul 24 2025 Ralf Ertzinger <ralf@skytale.net> - 2.0.30-4
- Disable perl-Coro for rawhide, as this blocks rebuilding
for perl 5.42 (see https://bugzilla.redhat.com/show_bug.cgi?id=2379448)
* Tue Jul 08 2025 Jitka Plesnikova <jplesnik@redhat.com> - 2.0.30-3
- Perl 5.42 rebuild
* Mon Jun 09 2025 Python Maint <python-maint@redhat.com> - 2.0.30-2
- Rebuilt for Python 3.14
* Sun Jun 08 2025 Ralf Ertzinger <ralf@skytale.net> - 2.0.30-1
- Update to 2.0.30