nginx: update to 1.4.0, enable SPDY module

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7655 ec354946-7b23-47d6-9f5a-488ba84defc7

n/nginx/nginx-vl.spec

@@ -25,7 +25,7 @@
 Summary:        Robust, small and high performance http and reverse proxy server
 Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
 Name:           nginx
-Version:        1.2.7
+Version:        1.4.0
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Daemons   
@@ -156,8 +156,8 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
 
 export DESTDIR=%{buildroot}
 
-## build with passenger
-./configure \
+
+CONFIGOPTS="\
     --user=%{nginx_user} \
     --group=%{nginx_group} \
     --prefix=%{nginx_datadir} \
@@ -173,6 +173,7 @@ export DESTDIR=%{buildroot}
     --with-file-aio \
     --with-ipv6 \
     --with-http_ssl_module \
+    --with-http_spdy_module \
     --with-http_realip_module \
     --with-http_addition_module \
     --with-http_xslt_module \
@@ -184,6 +185,7 @@ export DESTDIR=%{buildroot}
     --with-http_gzip_static_module \
     --with-http_random_index_module \
     --with-http_secure_link_module \
+    --with-http_degradation_module \
     --with-http_stub_status_module \
     --with-http_perl_module \
     --with-http_degradation_module \
@@ -198,64 +200,29 @@ export DESTDIR=%{buildroot}
 %if %{with wsgi}
     --add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
 %endif
-    --add-module=passenger-%{passenger_version}/ext/nginx \
 %ifarch i686
     --with-cpu-opt=pentiumpro \
     --with-zlib-asm=pentiumpro \
     --with-md5-asm \
     --with-sha1-asm \
 %endif
-    --with-cc-opt="-O6 %{optflags} $(pcre-config --cflags)"
+"
+
+
+## build with passenger
+./configure \
+    $CONFIGOPTS \
+    --with-cc-opt="%{optflags}" \
+    --add-module=passenger-%{passenger_version}/ext/nginx
+
 make %{?_smp_mflags} 
 mv objs/nginx objs/nginx.passenger
 
 ## build without passenger
 ./configure \
-    --user=%{nginx_user} \
-    --group=%{nginx_group} \
-    --prefix=%{nginx_datadir} \
-    --sbin-path=%{_sbindir}/%{name} \
-    --conf-path=%{nginx_confdir}/%{name}.conf \
-    --error-log-path=%{nginx_logdir}/error.log \
-    --http-log-path=%{nginx_logdir}/access.log \
-    --http-client-body-temp-path=%{nginx_home_tmp}/client_body \
-    --http-proxy-temp-path=%{nginx_home_tmp}/proxy \
-    --http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
-    --pid-path=%{_localstatedir}/run/%{name}.pid \
-    --lock-path=%{_localstatedir}/lock/subsys/%{name} \
-    --with-file-aio \
-    --with-ipv6 \
-    --with-http_ssl_module \
-    --with-http_realip_module \
-    --with-http_addition_module \
-    --with-http_xslt_module \
-    --with-http_image_filter_module \
-    --with-http_sub_module \
-    --with-http_dav_module \
-    --with-http_flv_module \
-    --with-http_gzip_static_module \
-    --with-http_random_index_module \
-    --with-http_secure_link_module \
-    --with-http_stub_status_module \
-    --with-http_perl_module \
-%if %{with geoip}
-    --with-http_geoip_module \
-%endif
-    --with-mail \
-    --with-mail_ssl_module \
-    --add-module=ngx-fancyindex-%{ngx_fancyindex_version} \
-    --add-module=giom-nginx_accept_language_module-%{nginx_accept_language_module_version} \
-    --add-module=gnosek-nginx-upstream-fair-%{upstream_fair_version} \
-%if %{with wsgi}
-    --add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
-%endif
-%ifarch i686
-    --with-cpu-opt=pentiumpro \
-    --with-zlib-asm=pentiumpro \
-    --with-md5-asm \
-    --with-sha1-asm \
-%endif
-    --with-cc-opt="-O6 %{optflags} $(pcre-config --cflags)"
+    $CONFIGOPTS \
+    --with-cc-opt="%{optflags}"
+
 make %{?_smp_mflags} 
 
 %install
@@ -384,10 +351,8 @@ fi
 
 %files passenger
 %defattr(-,root,root,-)
-%doc passenger-%{passenger_version}/doc/Users\ guide\ Nginx.*
-%doc passenger-%{passenger_version}/doc/ApplicationPool\ algorithm.txt
-%doc passenger-%{passenger_version}/doc/Architectural\ overview.*
-%doc passenger-%{passenger_version}/doc/Security\ of\ user\ switching\ support.*
+%doc passenger-%{passenger_version}/doc/*.txt
+%doc passenger-%{passenger_version}/doc/*.html
 %doc passenger-%{passenger_version}/doc/template
 %doc passenger-%{passenger_version}/doc/users_guide_snippets
 %doc passenger-%{passenger_version}/doc/images
@@ -395,6 +360,10 @@ fi
 
 
 %changelog
+* Mon Apr 29 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.0-1
+- update to 1.4.0
+- enable SPDY module
+
 * Wed Feb 13 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.7-1
 - new upstream release
 - update passenger to 3.0.19