nginx: update to 1.0.1

- add bcond_with wsgi for mod_wsgi
- add bcond_with passenger
  - you need to install rake.gem to build with this option.
- add Provides: webserver
  


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

n/nginx/nginx-vl.spec

@@ -1,3 +1,10 @@
+# build with passenger
+# need rake.gem to build with this option
+%bcond_with passenger
+
+# build mod_wsgi
+%bcond_with wsgi
+
 %define nginx_user      nginx
 %define nginx_group     %{nginx_user}
 %define nginx_home      %{_localstatedir}/lib/nginx
@@ -11,7 +18,7 @@
 Summary:        Robust, small and high performance http and reverse proxy server
 Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
 Name:           nginx
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Daemons   
@@ -38,6 +45,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 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
 
 # removes -Werror in upstream build scripts.  -Werror conflicts with
 # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
@@ -56,6 +67,10 @@ BuildRequires:      perl
 BuildRequires:      perl(ExtUtils::Embed)
 BuildRequires:	    libxml2-devel
 BuildRequires:	    libxslt-devel
+%if %{with passenger}
+BuildRequires:      ruby, rubygems
+%endif
+
 
 %if "%{?_dist_release}" == "vl4"
 Requires:	    perl >= 5.8.6
@@ -69,6 +84,8 @@ Requires(post):     chkconfig
 Requires(preun):    chkconfig, initscripts
 Requires(postun):   initscripts
 
+Provides: webserver
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
@@ -85,7 +102,7 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
  - IMAP/POP3 プロキシサーバ
 
 %prep
-%setup -q -a 1000 -a 1010
+%setup -q -a 1000 -a 1010 %{?with_wsgi:-a 1020} %{?with_passenger:-a 1030}
 
 %patch0 -p0
 %patch1 -p1
@@ -129,6 +146,12 @@ 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} \
+%if %{with wsgi}
+    --add-module=lifeeth-mod_wsgi-%{mod_wsgi_version} \
+%endif
+%if %{with passenger}
+    --add-module=passenger-%{passenger_version}/ext/nginx \
+%endif
 %ifarch i686
     --with-cpu-opt=pentiumpro \
     --with-zlib-asm=pentiumpro \
@@ -168,6 +191,13 @@ chmod 0755 %{buildroot}%{_sbindir}/nginx
 %{__install} -p -m 0644 %{SOURCE103} %{buildroot}%{nginx_webroot}/50x.html
 %{__install} -p -m 0644 %{SOURCE104} %{buildroot}%{nginx_webroot}/404.html
 
+%if %{with wsgi}
+%{__install} -p -m 0644 \
+    lifeeth-mod_wsgi-%{mod_wsgi_version}/conf/wsgi_vars \
+    %{buildroot}%{nginx_confdir}
+cp -f lifeeth-mod_wsgi-%{mod_wsgi_version}/README README.mod_wsgi
+%endif
+
 touch %{buildroot}%{nginx_confdir}/conf.d/virtual.conf
 
 # convert to UTF-8 all files that give warnings.
@@ -204,7 +234,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGES README
+%doc LICENSE CHANGES README %{?with_wsgi:README.mod_wsgi}
 %{nginx_datadir}/
 %{_sbindir}/%{name}
 %{_mandir}/man3/%{name}.3pm.gz
@@ -229,6 +259,9 @@ fi
 %config(noreplace) %{nginx_confdir}/scgi_params.default
 %config(noreplace) %{nginx_confdir}/uwsgi_params
 %config(noreplace) %{nginx_confdir}/uwsgi_params.default
+%if %{with wsgi}
+%config(noreplace) %{nginx_confdir}/wsgi_vars
+%endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %dir %{perl_vendorarch}/auto/%{name}
@@ -241,6 +274,15 @@ fi
 
 
 %changelog
+* Wed May 04 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.1-1
+- update to 1.0.1
+
+* Sun May 01 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.0-2
+- add bcond_with wsgi for mod_wsgi
+- add bcond_with passenger
+  - you need to install rake.gem to build with this option.
+- add Provides: webserver
+
 * Tue Apr 12 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.0-1
 - new upstream release 1.0.0!