kad pushed to uwsgi (master). "Weirdly, EL6 doesn't have perl-PSGI, EL7 doesn't have perl-Coro"

[notifications at fedoraproject.org]

>From 2f1e607f282a76df92871539fcabd352ab825830 Mon Sep 17 00:00:00 2001
From: Jorge Gallegos <kad at fedoraproject.org>
Date: Tue, 21 Apr 2015 11:38:33 -0700
Subject: Weirdly, EL6 doesn't have perl-PSGI, EL7 doesn't have perl-Coro


diff --git a/fedora.ini b/fedora.ini
index 023b04a..d39861d 100644
--- a/fedora.ini
+++ b/fedora.ini
@@ -9,4 +9,4 @@ routing = auto
 ssl = auto
 malloc_implementation = libc
 embedded_plugins = corerouter, echo, ping
-plugins = alarm_curl, alarm_xmpp, airbrake, cache, carbon, cgi, cplusplus, curl_cron, dumbloop, fastrouter, forkptyrouter, geoip, gevent, graylog2, http, jvm, jwsgi, ldap, logcrypto, logfile, logpipe, logsocket, lua, msgpack, nagios, pam, php, psgi, pty, python, rack, rawrouter, redislog, ring, router_access, router_basicauth, router_cache, router_expires, router_hash, router_http, router_memcached, router_metrics, router_radius, router_redirect, router_redis, router_rewrite, router_spnego, router_static, router_uwsgi, router_xmldir, rpc, rrdtool, rsyslog, ruby19, spooler, sqlite3, ssi, sslrouter, stats_pusher_file, stats_pusher_socket, stats_pusher_statsd, syslog, tornado, transformation_chunked, transformation_gzip, transformation_offload, transformation_template, transformation_tofile, transformation_toupper, ugreen, webdav, xattr, xslt, zabbix, zergpool
+plugins = alarm_curl, alarm_xmpp, airbrake, cache, carbon, cgi, cplusplus, curl_cron, dumbloop, fastrouter, forkptyrouter, geoip, gevent, graylog2, http, jvm, jwsgi, ldap, logcrypto, logfile, logpipe, logsocket, lua, msgpack, nagios, pam, php, pty, python, rack, rawrouter, redislog, ring, router_access, router_basicauth, router_cache, router_expires, router_hash, router_http, router_memcached, router_metrics, router_radius, router_redirect, router_redis, router_rewrite, router_spnego, router_static, router_uwsgi, router_xmldir, rpc, rrdtool, rsyslog, ruby19, spooler, sqlite3, ssi, sslrouter, stats_pusher_file, stats_pusher_socket, stats_pusher_statsd, syslog, tornado, transformation_chunked, transformation_gzip, transformation_offload, transformation_template, transformation_tofile, transformation_toupper, ugreen, webdav, xattr, xslt, zabbix, zergpool
diff --git a/uwsgi.spec b/uwsgi.spec
index 3b57ad1..d8c76ed 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -19,8 +19,9 @@
 %bcond_without tuntap
 %bcond_without zeromq
 %bcond_without greenlet
-%bcond_without perlcoro
+%bcond_without perl
 %bcond_without glusterfs
+
 #mono
 %ifnarch %{mono_arches}
 %bcond_with mono
@@ -59,16 +60,18 @@
 %bcond_with python3
 # el6 ships with ruby 1.8 but fiberloop/rbthreads needs 1.9
 %bcond_with ruby19
+# el7 doesn't have perl-PSGI
+%bcond_with perl
 # this fails in el not sure why
 %bcond_with gridfs
 %bcond_with tuntap
 %bcond_with mongodblibs
 %endif
 
-# Conditionally disable some things in epel7
+# Conditionally enable/disable some things in epel7
 %if 0%{?rhel} == 7
-# el7 doesn't ship with systemd
-%bcond_with systemd
+# el7 does have systemd
+%bcond_without systemd
 # el7 doesn't have python3
 %bcond_with python3
 # el7 doesn't have zeromq
@@ -76,7 +79,7 @@
 # el7 doesn't have greenlet
 %bcond_with greenlet
 # el7 doesn't have perl-Coro
-%bcond_with perlcoro
+%bcond_with perl
 # this fails in el not sure why
 %bcond_with glusterfs
 %bcond_with gridfs
@@ -127,7 +130,7 @@ BuildRequires:  gloox-devel, libstdc++-devel
 BuildRequires:  GeoIP-devel, libevent-devel, zlib-devel
 BuildRequires:  openldap-devel, boost-devel
 BuildRequires:  libattr-devel, libxslt-devel
-%if %{with perlcoro}
+%if %{with perl}
 BuildRequires:  perl-Coro
 %endif
 %if %{with zeromq}
@@ -454,7 +457,7 @@ Requires: %{name}-plugin-common
 %description -n %{name}-plugin-carbon
 This package contains the Carbon plugin for uWSGI (to use in graphite)
 
-%if %{with perlcoro}
+%if %{with perl}
 %package -n %{name}-plugin-coroae
 Summary:  uWSGI - Plugin for PERL Coro support
 Group:    System Environment/Daemons
@@ -626,6 +629,7 @@ Requires: %{name}-plugin-common
 %description -n %{name}-plugin-php
 This package contains the PHP plugin for uWSGI
 
+%if %{with perl}
 %package -n %{name}-plugin-psgi
 Summary:  uWSGI - Plugin for PSGI support
 Group:    System Environment/Daemons
@@ -633,6 +637,7 @@ Requires: perl-PSGI, %{name}-plugin-common
 
 %description -n %{name}-plugin-psgi
 This package contains the PSGI plugin for uWSGI
+%endif
 
 %package -n %{name}-plugin-pty
 Summary:  uWSGI - Plugin for PTY support
@@ -1051,8 +1056,9 @@ CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin
 %if %{with tuntap}
 CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin plugins/tuntap fedora
 %endif
-%if %{with perlcoro}
+%if %{with perl}
 CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin plugins/coroae fedora
+CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin plugins/psgi fedora
 %endif
 %if %{with zeromq}
 CFLAGS="%{optflags} -Wno-unused-but-set-variable" python uwsgiconfig.py --plugin plugins/logzmq fedora
@@ -1294,7 +1300,7 @@ fi
 %files -n %{name}-plugin-carbon
 %{_libdir}/%{name}/carbon_plugin.so
 
-%if %{with perlcoro}
+%if %{with perl}
 %files -n %{name}-plugin-coroae
 %{_libdir}/%{name}/coroae_plugin.so
 %endif
@@ -1375,8 +1381,10 @@ fi
 %files -n %{name}-plugin-php
 %{_libdir}/%{name}/php_plugin.so
 
+%if %{with perl}
 %files -n %{name}-plugin-psgi
 %{_libdir}/%{name}/psgi_plugin.so
+%endif
 
 %files -n %{name}-plugin-pty
 %{_libdir}/%{name}/pty_plugin.so
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/uwsgi.git/commit/?h=master&id=2f1e607f282a76df92871539fcabd352ab825830