nginx:

- add gnosek-nginx-upstream-fair module
- add ngx_http_upstream_keepalive module



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

n/nginx/nginx-vl.spec

@@ -15,7 +15,7 @@ Summary:        Robust, small and high performance http and reverse proxy server
 Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
 Name:           nginx
 Version:        1.0.2
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 Group:          System Environment/Daemons   
 # BSD License (two clause)
@@ -41,10 +41,15 @@ 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 mod_wsgi_version 6975f0ec7eeb
-Source1020: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
 %define passenger_version 3.0.5
-Source1030: passenger-%{passenger_version}.tar.gz
+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
 
 # removes -Werror in upstream build scripts.  -Werror conflicts with
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
@@ -63,7 +68,7 @@ BuildRequires:      perl
 BuildRequires:      perl(ExtUtils::Embed)
 BuildRequires:	    libxml2-devel
 BuildRequires:	    libxslt-devel
-
+BuildRequires:	    curl-devel
 
 %if "%{?_dist_release}" == "vl4"
 Requires:	    perl >= 5.8.6
@@ -114,7 +119,7 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
 このパッケージには Passenger サポートを含んだ nginxサーバが入っています。
 
 %prep
-%setup -q -a 1000 -a 1010 -a 1030 %{?with_wsgi:-a 1020}
+%setup -q -a 1000 -a 1010 -a 1020 -a 1030 -a 1040 %{?with_wsgi:-a 2000}
 
 %patch0 -p0
 %patch1 -p1
@@ -161,6 +166,8 @@ export DESTDIR=%{buildroot}
     --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} \
+    --add-module=ngx_http_upstream_keepalive-%{upstream_keepalive_version} \
 %if %{with wsgi}
     --add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
 %endif
@@ -208,6 +215,8 @@ mv objs/nginx objs/nginx.passenger
     --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} \
+    --add-module=ngx_http_upstream_keepalive-%{upstream_keepalive_version} \
 %if %{with wsgi}
     --add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
 %endif
@@ -259,6 +268,14 @@ chmod 0755 %{buildroot}%{_sbindir}/nginx.*
 cp -f lifeeth-mod_wsgi-%{mod_wsgi_version}/README README.mod_wsgi
 %endif
 
+# 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.
@@ -306,7 +323,10 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGES README %{?with_wsgi:README.mod_wsgi}
+%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
 %{_mandir}/man3/%{name}.3pm.gz
@@ -357,6 +377,10 @@ fi
 
 
 %changelog
+* Wed May 18 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.2-3
+- add gnosek-nginx-upstream-fair module
+- add ngx_http_upstream_keepalive module
+
 * Wed May 11 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.2-2
 - add nginx-passenger sub pakckage
   - use alternatives to choose nginx with or without passenger