update to 1.2.0

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

n/nginx/nginx-vl.spec

@@ -14,7 +14,7 @@
 Summary:        Robust, small and high performance http and reverse proxy server
 Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
 Name:           nginx
-Version:        1.0.14
+Version:        1.2.0
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Daemons   
@@ -41,12 +41,10 @@ Source104:  nginx-404.html
 Source1000: ngx-fancyindex-%{ngx_fancyindex_version}.tar.gz
 %define nginx_accept_language_module_version 02262ce
 Source1010: giom-nginx_accept_language_module-%{nginx_accept_language_module_version}.tar.gz
-%define passenger_version 3.0.11
+%define passenger_version 3.0.12
 Source1020: passenger-%{passenger_version}.tar.gz
 %define upstream_fair_version 2131c73
 Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
-%define upstream_keepalive_version 2ee28064a04a
-Source1040: ngx_http_upstream_keepalive-%{upstream_keepalive_version}.tar.gz
 
 %define mod_wsgi_version 6975f0ec7eeb
 Source2000: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
@@ -119,7 +117,7 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
 このパッケージには Passenger サポートを含んだ nginxサーバが入っています。
 
 %prep
-%setup -q -a 1000 -a 1010 -a 1020 -a 1030 -a 1040 %{?with_wsgi:-a 2000}
+%setup -q -a 1000 -a 1010 -a 1020 -a 1030 %{?with_wsgi:-a 2000}
 
 %patch0 -p0
 %patch1 -p1
@@ -167,7 +165,6 @@ export DESTDIR=%{buildroot}
     --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} \
-    --add-module=ngx_http_upstream_keepalive-%{upstream_keepalive_version} \
 %if %{with wsgi}
     --add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
 %endif
@@ -216,7 +213,6 @@ mv objs/nginx objs/nginx.passenger
     --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} \
-    --add-module=ngx_http_upstream_keepalive-%{upstream_keepalive_version} \
 %if %{with wsgi}
     --add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
 %endif
@@ -271,11 +267,6 @@ cp -f lifeeth-mod_wsgi-%{mod_wsgi_version}/README README.mod_wsgi
 # upstream fair module document
 cp -f gnosek-nginx-upstream-fair-%{upstream_fair_version}/README README.upstream_fair
 
-# upstream keepalive module document and sample
-mkdir -p upstream_keepalive_example
-cp -f ngx_http_upstream_keepalive-%{upstream_keepalive_version}/README README.upstream_keepalive
-cp -f ngx_http_upstream_keepalive-%{upstream_keepalive_version}/t/* upstream_keepalive_example
-
 touch %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
 
 # convert to UTF-8 all files that give warnings.
@@ -325,7 +316,6 @@ fi
 %defattr(-,root,root,-)
 %doc LICENSE CHANGES README 
 %doc README.upstream_fair
-%doc README.upstream_keepalive upstream_keepalive_example/
 %doc %{?with_wsgi:README.mod_wsgi}
 %{nginx_datadir}/
 %{_sbindir}/%{name}.normal
@@ -377,6 +367,11 @@ fi
 
 
 %changelog
+* Wed Apr 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.0-1
+- update to 1.2.0
+- update passenger to 3.0.12
+- drop http_upstream_keepalive
+
 * Mon Mar 19 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.14-1
 - new upstream release