From 7615d8eeecabc4930fd6dee0cd4f2c13416bf06a Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Apr 28 2014 10:06:25 +0000 Subject: don't conflict, make sure only one mod is loaded Resolves: rhbz#1087943 --- diff --git a/mod_wsgi.spec b/mod_wsgi.spec index 849b3c5..27e6261 100644 --- a/mod_wsgi.spec +++ b/mod_wsgi.spec @@ -14,7 +14,7 @@ Name: mod_wsgi Version: 3.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A WSGI interface for Python web applications in Apache Group: System Environment/Libraries License: ASL 2.0 @@ -43,7 +43,6 @@ Requires: httpd-mmn = %{_httpd_mmn} Summary: A WSGI interface for Python3 web applications in Apache Group: System Environment/Libraries Requires: httpd-mmn = %{_httpd_mmn} -Conflicts: %{name} %description -n python3-%{name} The mod_wsgi adapter is an Apacheache module that provides a WSGI compliant @@ -135,6 +134,9 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-wsgi.conf %endif %changelog +* Mon Apr 28 2014 Matthias Runge - 3.4.13 +- do not use conflicts between mod_wsgi packages (rhbz#1087943) + * Thu Jan 23 2014 Joe Orton - 3.4-12 - fix _httpd_mmn expansion in absence of httpd-devel diff --git a/wsgi-python3.conf b/wsgi-python3.conf index e83fb34..eb2c5e5 100644 --- a/wsgi-python3.conf +++ b/wsgi-python3.conf @@ -1 +1,6 @@ -LoadModule wsgi_module modules/mod_wsgi_python3.so +# NOTE: mod_wsgi_python3 can not coexist in the same apache process as +# mod_wsgi (python2). Only load if mod_wsgi is not already loaded. + + + LoadModule wsgi_module modules/mod_wsgi_python3.so + diff --git a/wsgi.conf b/wsgi.conf index 19f3567..0797bce 100644 --- a/wsgi.conf +++ b/wsgi.conf @@ -1 +1,7 @@ +# NOTE: mod_wsgi can not coexist in the same apache process as +# mod_wsgi_python3. Only load if mod_wsgi_python3 is not +# already loaded. + + LoadModule wsgi_module modules/mod_wsgi.so +