From 297f41ef5b01ecf6ae25cba1d0629d8bb9dc4707ecc4493bccf74e110b6e3225 Mon Sep 17 00:00:00 2001 From: James Oakley Date: Mon, 16 Apr 2018 23:50:18 +0000 Subject: [PATCH] - Disable apache2-mod_proxy_uwsgi on Leap 15 since upstream Apache includes the module now OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=67 --- uwsgi.changes | 6 ++++++ uwsgi.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/uwsgi.changes b/uwsgi.changes index dc1bccc..dee25df 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 16 23:48:42 UTC 2018 - jfunk@funktronics.ca + +- Disable apache2-mod_proxy_uwsgi on Leap 15 since upstream Apache includes + the module now + ------------------------------------------------------------------- Mon Apr 16 13:42:59 UTC 2018 - jfunk@funktronics.ca diff --git a/uwsgi.spec b/uwsgi.spec index d6b8f27..573c569 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -154,6 +154,7 @@ Different plugins can be used in order to add compatibility with different technology on top of the same core. +%if 0%{suse_version} < 1500 %package -n apache2-mod_proxy_uwsgi Summary: uWSGI Proxy Module for Apache 2.0 Group: Productivity/Networking/Web/Servers @@ -163,7 +164,7 @@ Requires: %{name} = %{version} uWSGI is a self-healing application container server coded in pure C. This package contains an Apache 2.0 proxy module for uWSGI. - +%endif %package -n apache2-mod_uwsgi Summary: uWSGI Module for Apache 2.0 @@ -525,7 +526,9 @@ python uwsgiconfig.py --build opensuse python3 uwsgiconfig.py --plugin plugins/python opensuse python3 # Build Apache modules +%if 0%{suse_version} < 1500 %{apxs} -c apache2/mod_proxy_uwsgi.c +%endif %{apxs} -c apache2/mod_uwsgi.c # Build php7 plugin @@ -656,9 +659,11 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcuwsgi %{_libdir}/uwsgi/zabbix_plugin.so %{_libdir}/uwsgi/zergpool_plugin.so +%if 0%{suse_version} < 1500 %files -n apache2-mod_proxy_uwsgi %defattr(-,root,root,-) %{apache_libexecdir}/mod_proxy_uwsgi.so +%endif %files -n apache2-mod_uwsgi %defattr(-,root,root,-)