From d7c401928bb4fd3b3cad58e10141c3b2a0d18096 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 20:29:19 +0100 Subject: [PATCH] restore this lost change: disable multiple python version cohexistence because it is not possible with apache [release 4.6.7-2mamba;Sun Aug 11 2019] --- apache-mod_wsgi.spec | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/apache-mod_wsgi.spec b/apache-mod_wsgi.spec index 41a77d6..92bad8a 100644 --- a/apache-mod_wsgi.spec +++ b/apache-mod_wsgi.spec @@ -1,13 +1,13 @@ Name: apache-mod_wsgi -Version: 4.6.4 -Release: 1mamba +Version: 4.6.7 +Release: 2mamba Summary: an Apache module that implements a WSGI compliant interface for hosting Python based web applications Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://pypi.python.org/pypi/mod_wsgi -Source: https://pypi.python.org/packages/source/m/mod_wsgi/mod_wsgi-%{version}.tar.gz +Source: https://pypi.debian.net/mod-wsgi/mod_wsgi-%{version}.tar.gz Source1: wsgi-tmpfile.conf Source2: wsgi-apache.conf License: Apache License 2.0 @@ -15,6 +15,7 @@ License: Apache License 2.0 BuildRequires: glibc-devel BuildRequires: libpython3-devel ## AUTOBUILDREQ-END +BuildRequires: libpython3-devel >= 3.7.4 BuildRequires: libpython-devel BuildRequires: apache >= 2.4 Requires: apache >= 2.4 @@ -53,40 +54,46 @@ sed -i "s,.*/man/.*,&.gz," %{name}.filelist %makeinstall -install -D -m0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/wsgi%{?pyappend:-%pyappend}.conf -install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/httpd.d/wsgi%{?pyappend:-%pyappend}.conf +install -D -m0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/wsgi.conf +install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/httpd.d/wsgi.conf -%if 0%{?with_pyver} -mv %{buildroot}%{_libdir}/apache/mod_wsgi.so %{buildroot}%{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so -mv %{buildroot}%{_bindir}/mod_wsgi-express %{buildroot}%{_bindir}/mod_wsgi-express%{?pyappend:-%pyappend} -sed -i "s|%{_bindir}/mod_wsgi-express|%{_bindir}/mod_wsgi-express%{?pyappend:-%pyappend}|" %{name}.filelist -%endif +#%if 0%{?with_pyver} +#mv %{buildroot}%{_libdir}/apache/mod_wsgi.so %{buildroot}%{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so +#mv %{buildroot}%{_bindir}/mod_wsgi-express %{buildroot}%{_bindir}/mod_wsgi-express%{?pyappend:-%pyappend} +#sed -i "s|%{_bindir}/mod_wsgi-express|%{_bindir}/mod_wsgi-express%{?pyappend:-%pyappend}|" %{name}.filelist +#%endif %post %{?pyappend} if [ $1 -ge 1 ]; then # WORKAROUND: using tmpfiles_create macro unsets %pyappend variable for yet unknown reasons - #% tmpfiles_create wsgi%{?pyappend:-%pyappend}.conf - systemd-tmpfiles --create wsgi%{?pyappend:-%pyappend}.conf >/dev/null 2>&1 || : + #% tmpfiles_create wsgi.conf + systemd-tmpfiles --create wsgi.conf >/dev/null 2>&1 || : systemctl -q daemon-reload - %{_bindir}/apxs -e -a -n wsgi%{?pyappend} %{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so > /dev/null + %{_bindir}/apxs -e -a -n wsgi %{_libdir}/apache/mod_wsgi.so > /dev/null fi : %preun %{?pyappend} if [ $1 -eq 0 ]; then systemctl -q daemon-reload - %{_bindir}/apxs -e -A -n wsgi%{?pyappend} %{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so > /dev/null + %{_bindir}/apxs -e -A -n wsgi %{_libdir}/apache/mod_wsgi.so > /dev/null fi : %files %{?pyappend} -f %{name}.filelist %defattr(-,root,root) -%{_sysconfdir}/httpd/httpd.d/wsgi%{?pyappend:-%pyappend}.conf -%{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so -%{_tmpfilesdir}/wsgi%{?pyappend:-%pyappend}.conf +%{_sysconfdir}/httpd/httpd.d/wsgi.conf +%{_libdir}/apache/mod_wsgi.so +%{_tmpfilesdir}/wsgi.conf %doc LICENSE %changelog +* Sun Aug 11 2019 Silvan Calarco 4.6.7-2mamba +- restore this lost change: disable multiple python version cohexistence because it is not possible with apache + +* Thu Aug 08 2019 Silvan Calarco 4.6.7-1mamba +- update to 4.6.7 + * Thu Sep 06 2018 Silvan Calarco 4.6.4-1mamba - update to 4.6.4