- disable extra modules on sle

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

nginx.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 22 09:40:19 UTC 2017 - mrueckert@suse.de
+
+- disable extra modules on sle
+
 -------------------------------------------------------------------
 Sat Sep 16 20:16:46 UTC 2017 - mrueckert@suse.de
 

nginx.spec

@@ -18,6 +18,11 @@
 
 %bcond_with    cpp_test
 %bcond_with    google_perftools
+%if 0%{?is_opensuse}
+%bcond_without extra_modules
+%else
+%bcond_without extra_modules
+%endif
 
 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
 %bcond_without libatomic
@@ -163,7 +168,9 @@ This package holds the VIM support for nginx config files.
 %patch2
 %patch3
 %patch4 -p1
+%if %{with extra_modules}
 %patch5
+%endif
 
 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl
 # we just use lib here because nginx loads them relative to _prefix
@@ -238,10 +245,12 @@ sed -i "s/\/var\/run/\/run/" conf/nginx.conf
   --with-cpp_test_module                       \
   %endif
   --with-compat                                \
+  %if %{with extra_modules}
   --add-module=%{nginx_upstream_check_module_path} \
   --add-dynamic-module=%{ngx_fancyindex_module_path} \
   --add-dynamic-module=%{headers_more_nginx_module_path} \
   --add-dynamic-module=%{nginx_rtmp_module_path} \
+  %endif
 %if 0%{?suse_version} > 1220
   --with-cc-opt="%{optflags} -fPIC -D_GNU_SOURCE -std=gnu99 -fstack-protector" \
   --with-ld-opt="-Wl,-z,relro,-z,now -pie"
@@ -363,9 +372,11 @@ copydocs %{nginx_rtmp_module_path} \
 %{ngx_module_dir}/ngx_stream_module.so
 %{ngx_module_dir}/ngx_stream_geoip_module.so
 # external modules
+%if %{with extra_modules}
 %{ngx_module_dir}/ngx_http_fancyindex_module.so
 %{ngx_module_dir}/ngx_http_headers_more_filter_module.so
 %{ngx_module_dir}/ngx_rtmp_module.so
+%endif
 %{_mandir}/man3/nginx.3pm*
 /srv/www/htdocs/50x.html
 %if 0%{?suse_version} && 0%{?suse_version} < 1140