diff --git a/apache-mod_wsgi.spec b/apache-mod_wsgi.spec index 8bc7916..41a77d6 100644 --- a/apache-mod_wsgi.spec +++ b/apache-mod_wsgi.spec @@ -1,6 +1,6 @@ Name: apache-mod_wsgi -Version: 4.4.12 -Release: 2mamba +Version: 4.6.4 +Release: 1mamba Summary: an Apache module that implements a WSGI compliant interface for hosting Python based web applications Group: System/Libraries Vendor: openmamba @@ -24,56 +24,72 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description The mod_wsgi package provides an Apache module that implements a WSGI compliant interface for hosting Python based web applications on top of the Apache web server. +%if 0%{?with_pyver} +%pyver_package +%endif + %prep %setup -q -n mod_wsgi-%{version} -%build -CFLAGS="%{optflags}" %{__python3} setup.py build -%configure \ - --with-python=%{__python3} +%build +CFLAGS="%{optflags}" %{__python} setup.py build + +%configure\ + --with-python=%{__python} %make %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python3} setup.py install \ +%{__python} setup.py install \ -O1 --skip-build \ --root="%{buildroot}" \ --install-headers=%{_includedir}/python \ - --install-lib=%{python3_sitearch} \ + --install-lib=%{python_sitearch} \ --record=%{name}.filelist -sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist +sed -i "s,.*/man/.*,&.gz," %{name}.filelist %makeinstall -install -D -m0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/wsgi.conf -install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/httpd.d/wsgi.conf +install -D -m0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/wsgi%{?pyappend:-%pyappend}.conf +install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/httpd.d/wsgi%{?pyappend:-%pyappend}.conf -%post +%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 || : systemctl -q daemon-reload - %tmpfiles_create wsgi.conf - %{_bindir}/apxs -e -a -n wsgi %{_libdir}/apache/mod_wsgi.so > /dev/null + %{_bindir}/apxs -e -a -n wsgi%{?pyappend} %{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so > /dev/null fi : -%preun +%preun %{?pyappend} if [ $1 -eq 0 ]; then systemctl -q daemon-reload - %{_bindir}/apxs -e -A -n wsgi %{_libdir}/apache/mod_wsgi.so > /dev/null + %{_bindir}/apxs -e -A -n wsgi%{?pyappend} %{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so > /dev/null fi : -%files -f %{name}.filelist +%files %{?pyappend} -f %{name}.filelist %defattr(-,root,root) -%{_sysconfdir}/httpd/httpd.d/wsgi.conf -%{_libdir}/apache/mod_wsgi.so -%{_tmpfilesdir}/wsgi.conf +%{_sysconfdir}/httpd/httpd.d/wsgi%{?pyappend:-%pyappend}.conf +%{_libdir}/apache/mod_wsgi%{?pyappend:-%pyappend}.so +%{_tmpfilesdir}/wsgi%{?pyappend:-%pyappend}.conf %doc LICENSE %changelog +* Thu Sep 06 2018 Silvan Calarco 4.6.4-1mamba +- update to 4.6.4 + * Mon Aug 24 2015 Silvan Calarco 4.4.12-2mamba - install tmpfiles and apache configurations for /run/wsgi as default socket dir