- disable rtsig on x32. There is no sysctl on x32

- added bcond threads (new feature in 1.7.11)
- rel 2

diff --git a/nginx.spec b/nginx.spec
index 2b0b737f0294ce549886c7a2cca29af3a766b3a7..9a7dec8269102c17f90c89f18de1c431e2028a6b 100644 (file)
--- a/nginx.spec
+++ b/nginx.spec
@@ -21,8 +21,13 @@
 %bcond_without ssl             # ssl support
 %bcond_with    http_browser    # header "User-agent" parser
 %bcond_with    rtmp            # rtmp support
+%bcond_with    threads         # thread pool support
 %bcond_without auth_request    # auth_request module
 
+%ifarch x32
+%undefine      with_rtsig
+%endif
+
 %define                rtmp_version    1.1.7
 Summary:       High perfomance HTTP and reverse proxy server
 Summary(pl.UTF-8):     Serwer HTTP i odwrotne proxy o wysokiej wydajności
@@ -31,7 +36,7 @@ Summary(pl.UTF-8):    Serwer HTTP i odwrotne proxy o wysokiej wydajności
 # - mainline: production quality but API can change
 Name:          nginx
 Version:       1.7.11
-Release:       1
+Release:       2
 License:       BSD-like
 Group:         Networking/Daemons/HTTP
 Source0:       http://nginx.org/download/%{name}-%{version}.tar.gz
@@ -327,6 +332,7 @@ cp -f configure auto/
        %{!?with_http_browser:--without-http_browser_module} \
        %{?with_rtmp:--add-module=./nginx-rtmp-module} \
        %{?with_auth_request:--with-http_auth_request_module} \
+       %{?with_threads:--with-threads} \
        --with-http_secure_link_module \
        --http-client-body-temp-path=%{_localstatedir}/cache/%{name}-perl/client_body_temp \
        --http-proxy-temp-path=%{_localstatedir}/cache/%{name}-perl/proxy_temp \
@@ -390,6 +396,7 @@ mv -f objs/nginx contrib/nginx-mail
        %{?with_ssl:--with-http_ssl_module} \
        %{?with_rtmp:--add-module=./nginx-rtmp-module} \
        %{?with_auth_request:--with-http_auth_request_module} \
+       %{?with_threads:--with-threads} \
        --without-http_browser_module \
        --without-mail_pop3_module \
        --without-mail_imap_module \
@@ -430,6 +437,7 @@ mv -f objs/nginx contrib/nginx-light
        %{!?with_http_browser:--without-http_browser_module} \
        %{?with_rtmp:--add-module=./nginx-rtmp-module} \
        %{?with_auth_request:--with-http_auth_request_module} \
+       %{?with_threads:--with-threads} \
        --with-http_secure_link_module \
        --http-client-body-temp-path=%{_localstatedir}/cache/%{name}-standard/client_body_temp \
        --http-proxy-temp-path=%{_localstatedir}/cache/%{name}-standard/proxy_temp \