diff --git a/nginx/nginx.spec b/nginx/nginx.spec index a1e04527a8..9d97b4e157 100644 --- a/nginx/nginx.spec +++ b/nginx/nginx.spec @@ -22,13 +22,15 @@ ## # package version -%define V_nginx 1.7.10 -%define V_nginx_headmore 0.25 -%define V_nginx_ajp 0.3.0 -%define V_nginx_lua 0.9.13 -%define V_nginx_redis 0.11 -%define V_nginx_echo 0.57 -%define V_nginx_davext 0.0.3 +%define V_nginx 1.7.10 +%define V_nginx_headmore 0.25 +%define V_nginx_ajp 0.3.0 +%define V_nginx_lua 0.9.13 +%define V_nginx_redis 0.11 +%define V_nginx_echo 0.57 +%define V_nginx_davext 0.0.3 +%define V_nginx_digest 20150331 +%define V_nginx_fancyindex 0.3.5 # package information Name: nginx @@ -44,12 +46,14 @@ Version: %{V_nginx} Release: 20150331 # package options -%option with_ajp no -%option with_perl no -%option with_lua no -%option with_redis no -%option with_echo no -%option with_davext no +%option with_ajp no +%option with_perl no +%option with_lua no +%option with_redis no +%option with_echo no +%option with_davext no +%option with_digest no +%option with_fancyindex no # list of sources Source0: http://nginx.org/download/nginx-%{V_nginx}.tar.gz @@ -59,8 +63,10 @@ Source3: https://github.com/openresty/lua-nginx-module/archive/v%{V_nginx_l Source4: https://github.com/openresty/redis2-nginx-module/archive/v%{V_nginx_redis}.tar.gz Source5: https://github.com/openresty/echo-nginx-module/archive/v%{V_nginx_echo}.tar.gz Source6: https://github.com/arut/nginx-dav-ext-module/archive/v%{V_nginx_davext}.tar.gz -Source7: nginx.conf -Source8: rc.nginx +Source7: http://download.openpkg.org/components/versioned/nginx/nginx-http-auth-digest-%{V_nginx_digest}.tar.gz +Source8: https://github.com/aperezdc/ngx-fancyindex/archive/v%{V_nginx_fancyindex}.tar.gz +Source9: nginx.conf +Source10: rc.nginx Patch0: nginx.patch # build information @@ -123,6 +129,16 @@ PreReq: expat url = https://github.com/arut/nginx-dav-ext-module/releases regex = v(__VER__)\.tar\.gz } + prog nginx:nginx-digest = { + version = %{V_nginx_digest} + url = http://download.openpkg.org/components/versioned/nginx/ + regex = nginx-http-auth-digest-(__VER__)\.tar\.gz + } + prog nginx:nginx-fancyindex = { + version = %{V_nginx_fancyindex} + url = https://github.com/aperezdc/ngx-fancyindex/releases + regex = v(__VER__)\.tar\.gz + } %prep %setup -q @@ -149,6 +165,14 @@ PreReq: expat %setup -q -T -D -a 6 mv nginx-dav-ext-module-* nginx_davext_module %endif +%if "%{with_digest}" == "yes" + %setup -q -T -D -a 7 + mv nginx-http-auth-digest nginx_http_auth_digest_module +%endif +%if "%{with_fancyindex}" == "yes" + %setup -q -T -D -a 8 + mv ngx-fancyindex-* nginx_fancyindex_module +%endif %build # configure program @@ -195,18 +219,26 @@ PreReq: expat %endif %if "%{with_davext}" == "yes" --add-module=`pwd`/nginx_davext_module \ +%endif +%if "%{with_digest}" == "yes" + --add-module=`pwd`/nginx_http_auth_digest_module \ +%endif +%if "%{with_fancyindex}" == "yes" + --add-module=`pwd`/nginx_fancyindex_module \ %endif --with-http_addition_module \ + --with-http_auth_request_module \ --with-http_dav_module \ --with-http_degradation_module \ --with-http_flv_module \ --with-http_geoip_module \ + --with-http_gunzip_module \ --with-http_gzip_static_module \ --with-http_random_index_module \ --with-http_realip_module \ --with-http_secure_link_module \ - --with-http_ssl_module \ --with-http_spdy_module \ + --with-http_ssl_module \ --with-http_stub_status_module \ --with-http_sub_module