From 99c9d2a87619bc2e195bf9d9ce08d70129e997b982e96b6b53641fa4d9014e51 Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Sat, 28 Apr 2018 03:18:38 +0000
Subject: [PATCH 1/2] Accepting request 600381 from
 home:stroeder:branches:server:http

- Require Apache 2.4.33 for Leap 15 and Tumbleweed
  because otherwise mod_proxy_uwsgi is not available (bsc#1090695)

OBS-URL: https://build.opensuse.org/request/show/600381
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=71
---
 uwsgi.changes | 6 ++++++
 uwsgi.spec    | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/uwsgi.changes b/uwsgi.changes
index ef56e66..9dddf57 100644
--- a/uwsgi.changes
+++ b/uwsgi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 24 10:48:33 UTC 2018 - michael@stroeder.com
+
+- Require Apache 2.4.33 for Leap 15 and Tumbleweed
+  because otherwise mod_proxy_uwsgi is not available (bsc#1090695)
+
 -------------------------------------------------------------------
 Wed Apr 18 13:32:20 UTC 2018 - guillaume.gardet@opensuse.org
 
diff --git a/uwsgi.spec b/uwsgi.spec
index 34d9b81..d0f74ed 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -47,7 +47,11 @@ Patch3:         uwsgi-1.9.11-systemd_logger-old_systemd.patch
   %define apxs %{_sbindir}/apxs2
 %endif
 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR)
+%if 0%{suse_version} < 1500
 BuildRequires:  apache2-devel
+%else
+BuildRequires:  apache2-devel>=2.4.33
+%endif
 %if 0%{?suse_version} >= 1500
 BuildRequires:  argon2-devel
 %endif

From 8fb17bc2a8f6de195db054fc9b48feeedfed75b4a84e51fcdcd8d8d896cbcd91 Mon Sep 17 00:00:00 2001
From: James Oakley <jfunk@funktronics.ca>
Date: Thu, 31 May 2018 01:08:03 +0000
Subject: [PATCH 2/2] - Don't create a /run directory for Apache on startup. It
 fails if Apache is   not installed and sockets are defined per-application
 anyway (bnc#1082002) - Fix broken build dependency on Leap 15

OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=72
---
 uwsgi.changes | 7 +++++++
 uwsgi.service | 3 ---
 uwsgi.spec    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/uwsgi.changes b/uwsgi.changes
index 9dddf57..149f494 100644
--- a/uwsgi.changes
+++ b/uwsgi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 31 00:45:55 UTC 2018 - jfunk@funktronics.ca
+
+- Don't create a /run directory for Apache on startup. It fails if Apache is
+  not installed and sockets are defined per-application anyway (bnc#1082002)
+- Fix broken build dependency on Leap 15
+
 -------------------------------------------------------------------
 Tue Apr 24 10:48:33 UTC 2018 - michael@stroeder.com
 
diff --git a/uwsgi.service b/uwsgi.service
index fa81e02..9d99c2c 100644
--- a/uwsgi.service
+++ b/uwsgi.service
@@ -1,11 +1,8 @@
 [Unit]
 Description=Application Container Server for Networked/Clustered Web Applications
-Requires=var-run.mount
-After=var-run.mount
 Documentation=https://uwsgi-docs.readthedocs.io/en/latest/
 
 [Service]
-ExecStartPre=/usr/bin/install -d -o wwwrun -g www -m 0755 /run/uwsgi
 ExecStart=/usr/sbin/uwsgi --autoload --ini /etc/uwsgi/uwsgi.ini
 Restart=always
 Type=notify
diff --git a/uwsgi.spec b/uwsgi.spec
index d0f74ed..e60a380 100644
--- a/uwsgi.spec
+++ b/uwsgi.spec
@@ -50,7 +50,7 @@ Patch3:         uwsgi-1.9.11-systemd_logger-old_systemd.patch
 %if 0%{suse_version} < 1500
 BuildRequires:  apache2-devel
 %else
-BuildRequires:  apache2-devel>=2.4.33
+BuildRequires:  apache2-devel >= 2.4.33
 %endif
 %if 0%{?suse_version} >= 1500
 BuildRequires:  argon2-devel