Accepting request 871143 from home:fschnizlein:branches:server:http

Remove {?is_opensuse} conditions to sync openSUSE and SLE (jsc#SLE-12124).

OBS-URL: https://build.opensuse.org/request/show/871143
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx-macros?expand=0&rev=5

nginx-macros.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb 11 08:43:09 UTC 2021 - Felix Schnizlein <fschnizlein@suse.com>
+
+- Remove {?is_opensuse} conditions to sync openSUSE and SLE (jsc#SLE-12124)
+
 -------------------------------------------------------------------
 Mon Nov  9 15:41:53 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
 

nginx-macros.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nginx-macros
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

nginx.macros

@@ -16,11 +16,6 @@
 %ngx_doc_dir    %{_docdir}/%{name}
 
 %ngx_conditionals \
-%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} \
-%bcond_without ngx_libatomic \
-%else \
-%bcond_with    ngx_libatomic \
-%endif \
 %if 0%{?suse_version} > 1220 \
 %bcond_without ngx_http2 \
 %bcond_without ngx_pcre_jit \
@@ -87,9 +82,6 @@
   %if %{with ngx_pcre_jit}                          \
   --with-pcre-jit                                 \\\
   %endif                                            \
-  %if %{with ngx_libatomic}                         \
-  --with-libatomic                                \\\
-  %endif                                            \
   %if %{with ngx_google_perftools}                  \
   --with-google_perftools_module                  \\\
   %endif                                            \
@@ -107,4 +99,4 @@
 
 %ngx_requires \
 %requires_eq nginx \
-%{nil}
+%{nil}