From: parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 7 Dec 2018 15:55:26 +0000 (+0100)
Subject: mod_wsgi now called python2-mod_wsgi
X-Git-Tag: myplc-5.3-5~11
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=aab7636f16f072802f91f20b8f2307570d290e04

mod_wsgi now called python2-mod_wsgi
---

diff --git a/myplc.spec b/myplc.spec
index 2806623..66dbe08 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -72,6 +72,9 @@ Requires: nodeconfig
 Requires: nodeyum
 Requires: plcapi >= 5.2
 # this technically is a plcapi dependency but it's simpler here for chosing which
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 29
+Requires: python2-mod_wsgi
+%else
 %if "%{distro}" == "Fedora" && %{distrorelease} >= 18
 Requires: mod_wsgi
 %else
diff --git a/plc.d/httpd b/plc.d/httpd
index 48c8beb..6180e6e 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -183,7 +183,7 @@ EOF
 		# with mod_python preferred
 		if rpm -q mod_python >& /dev/null ; then
 		    configure_for_mod_python=true
-		elif rpm -q mod_wsgi >& /dev/null ; then
+		elif rpm -q mod_wsgi >& /dev/null || rpm -q python2-mod_wsgi >& /dev/null ; then
 		    configure_for_mod_wsgi=true
 		else
 		    echo "Requires mod_python or mod_wsgi.... exiting"