Tmux update, RPM update to 1.20 mainline

centos/SPECS/nginx.spec

@@ -22,8 +22,8 @@
 
 Name:              nginx
 Epoch:             1
-Version:           1.19.10
-Release:           1%{?dist}
+Version:           1.20.0
+Release:           2%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -72,9 +72,6 @@ Requires:          nginx-filesystem = %{epoch}:%{version}-%{release}
 Requires:          openssl
 Requires:          pcre
 Requires(pre):     nginx-filesystem
-%if 0%{?with_mailcap_mimetypes}
-Requires:          nginx-mimetypes
-%endif
 Provides:          webserver
 
 BuildRequires:     systemd
@@ -328,6 +325,7 @@ export DESTDIR=%{buildroot}
     --with-http_v2_module \
     --with-http_realip_module \
     --with-http_addition_module \
+    --with-http_auth_request_module \
     --with-http_xslt_module=dynamic \
     --with-http_image_filter_module=dynamic \
     --with-http_geoip_module=dynamic \
@@ -342,6 +340,8 @@ export DESTDIR=%{buildroot}
     --with-http_degradation_module \
     --with-http_slice_module \
     --with-http_stub_status_module \
+    --with-http_sub_module \
+    --with-http_v2_module \
     --with-http_perl_module=dynamic \
     --with-http_auth_request_module \
     --with-mail=dynamic \
@@ -374,6 +374,7 @@ export DESTDIR=%{buildroot}
     --add-dynamic-module=%{_builddir}/set-misc-nginx-module-master \
 %endif
     --with-debug \
+    --with-threads \
     --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
     --with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols
 
@@ -427,10 +428,6 @@ install -p -m 0644 %{SOURCE101} %{SOURCE102} \
 install -p -m 0644 %{SOURCE103} %{SOURCE104} \
     %{buildroot}%{_datadir}/nginx/html
 
-%if 0%{?with_mailcap_mimetypes}
-rm -f %{buildroot}%{_sysconfdir}/nginx/mime.types
-%endif
-
 install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 \
     %{buildroot}%{_mandir}/man8/nginx.8
 
@@ -598,6 +595,7 @@ fi
 %config(noreplace) %{_sysconfdir}/nginx/mime.types
 %endif
 %config(noreplace) %{_sysconfdir}/nginx/mime.types.default
+%config(noreplace) %{_sysconfdir}/nginx/mime.types
 %config(noreplace) %{_sysconfdir}/nginx/nginx.conf
 %config(noreplace) %{_sysconfdir}/nginx/nginx.conf.default
 %config(noreplace) %{_sysconfdir}/nginx/scgi_params
@@ -694,7 +692,13 @@ fi
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %changelog
-* Mon Apr 3 2021 Daniel Steiner <daniel.steiner@threema.ch> 
+* Wed Jul 7 2021 Daniel Steiner <daniel.steiner@threema.ch> 
+- Upadate to mainline version 1.20.1.
+
+* Wed Jul 7 2021 Daniel Steiner <daniel.steiner@threema.ch> 
+- Upadate to mainline version 1.20.0.
+
+* Mon Apr 5 2021 Daniel Steiner <daniel.steiner@threema.ch> 
 - Upadate to version 1.19.10 on CentOS 8.
 
 * Mon Mar 29 2021 Daniel Steiner <daniel.steiner@threema.ch>