|
|
@@ -2,7 +2,11 @@
|
|
|
%bcond_with wsgi
|
|
|
|
|
|
# build http_geoip_module
|
|
|
+%if "%{_dist_release}" >= "vl7"
|
|
|
%bcond_without geoip
|
|
|
+%else
|
|
|
+%bcond_with geoip
|
|
|
+%endif
|
|
|
|
|
|
%if "%{_dist_release}" > "vl6"
|
|
|
%define nginx_user www-data
|
|
|
@@ -21,8 +25,8 @@
|
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
|
Name: nginx
|
|
|
-Version: 1.2.4
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Version: 1.2.5
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
|
# BSD License (two clause)
|
|
|
@@ -48,7 +52,7 @@ 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.12
|
|
|
+%define passenger_version 3.0.17
|
|
|
Source1020: passenger-%{passenger_version}.tar.gz
|
|
|
%define upstream_fair_version 2131c73
|
|
|
Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
|
|
|
@@ -113,8 +117,16 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
|
|
|
%package passenger
|
|
|
Summary: Nginx with mod_passenger support
|
|
|
Summary(ja): Passenger サポート入りの Nginx
|
|
|
-Group: System Environment/Daemons
|
|
|
-BuildRequires: ruby, rubygems, rubygem-rake
|
|
|
+Group: System Environment/Daemons
|
|
|
+BuildRequires: ruby, rubygem-rake
|
|
|
+Requires: ruby, rubygem-rake
|
|
|
+%if "%{_dist_release}" >= "vl7"
|
|
|
+BuildRequires: ruby-devel, ruby-rubygems
|
|
|
+Requires: ruby-rubygems
|
|
|
+%else
|
|
|
+BuildRequires: rubygems
|
|
|
+Requires: rubygems
|
|
|
+%endif
|
|
|
Requires: nginx
|
|
|
|
|
|
%description passenger
|
|
|
@@ -381,6 +393,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.5-1
|
|
|
+- new upstream release
|
|
|
+- update passenger to 3.0.17
|
|
|
+
|
|
|
* Wed Oct 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.4-3
|
|
|
- rebuild with pcre-8.31
|
|
|
|
daisuke