From 882687d472012b38b72765ff0bbc5c2d695f4cdd283cc24e3690b553320f11ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?=
 =?UTF-8?q?=D0=BE?= <ilya@ilya.cf>
Date: Sat, 27 Feb 2021 10:57:30 +0000
Subject: [PATCH] cleanup build conditionals and fix the previous change for
 the is_opensuse. update to 1.19.7

OBS-URL: https://build.opensuse.org/package/show/server:http/nginx-macros?expand=0&rev=7
---
 nginx-macros.changes | 12 ++++++++++++
 nginx.macros         | 19 ++-----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/nginx-macros.changes b/nginx-macros.changes
index c732a3b..4792006 100644
--- a/nginx-macros.changes
+++ b/nginx-macros.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Feb 16 23:31:02 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- Since we only target sle 12 and above we can skip all
+  conditionals which apply to suse_version before 1315
+
+  With changes in nginx itself we will drop support for sysvinit.
+  http2, libatomic support and pcre_jit will always be on now.
+  and we build all binaries with PIE now.
+- Moved the last 2 path macros from nginx.spec to the macros file.
+  (pid and lock path)
+
 -------------------------------------------------------------------
 Thu Feb 11 08:43:09 UTC 2021 - Felix Schnizlein <fschnizlein@suse.com>
 
diff --git a/nginx.macros b/nginx.macros
index ce756bc..ec48363 100644
--- a/nginx.macros
+++ b/nginx.macros
@@ -14,17 +14,10 @@
 %ngx_tmp_uwsgi  %{ngx_home}/uwsgi/
 %ngx_user_group nginx
 %ngx_doc_dir    %{_docdir}/%{name}
+%ngx_pid_path   /run/nginx.pid
+%ngx_lock_path  /run/nginx.lock
 
 %ngx_conditionals \
-%if 0%{?suse_version} > 1220 \
-%bcond_without ngx_http2 \
-%bcond_without ngx_pcre_jit \
-%bcond_without systemd \
-%else \
-%bcond_with    ngx_http2 \
-%bcond_with    ngx_pcre_jit \
-%bcond_with    systemd \
-%endif \
 %bcond_with    ngx_cpp_test \
 %bcond_with    ngx_google_perftools \
 %{nil}
@@ -51,9 +44,7 @@
   --with-file-aio                                 \\\
   --with-ipv6                                     \\\
   --with-http_ssl_module                          \\\
-  %if %{with ngx_http2}                             \
   --with-http_v2_module                           \\\
-  %endif                                            \
   --with-http_realip_module                       \\\
   --with-http_addition_module                     \\\
   --with-http_xslt_module=dynamic                 \\\
@@ -79,21 +70,15 @@
   --with-stream_realip_module                     \\\
   --with-stream_ssl_preread_module                \\\
   --with-pcre                                     \\\
-  %if %{with ngx_pcre_jit}                          \
   --with-pcre-jit                                 \\\
-  %endif                                            \
   %if %{with ngx_google_perftools}                  \
   --with-google_perftools_module                  \\\
   %endif                                            \
   %if %{with ngx_cpp_test}                          \
   --with-cpp_test_module                          \\\
   %endif                                            \
-  %if 0%{?suse_version} > 1220                      \
   --with-cc-opt="%{optflags} -fPIC -D_GNU_SOURCE" \\\
   --with-ld-opt="-Wl,-z,relro,-z,now -pie"        \\\
-  %else                                             \
-  --with-cc-opt="%{optflags}"                     \\\
-  %endif                                            \
   --with-compat