|
|
@@ -25,7 +25,7 @@
|
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
|
Name: nginx
|
|
|
-Version: 1.9.15
|
|
|
+Version: 1.10.1
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
|
@@ -52,7 +52,9 @@ Source104: nginx-404.html
|
|
|
Source1000: ngx-fancyindex-%{ngx_fancyindex_version}.tar.xz
|
|
|
%define nginx_accept_language_module_version 02262ce
|
|
|
Source1010: giom-nginx_accept_language_module-%{nginx_accept_language_module_version}.tar.gz
|
|
|
-%define passenger_version 5.0.27
|
|
|
+
|
|
|
+## https://github.com/phusion/passenger/archive/release-%{passenger_version}.tar.gz
|
|
|
+%define passenger_version 5.0.28
|
|
|
Source1020: passenger-%{passenger_version}.tar.gz
|
|
|
%define upstream_fair_version 2131c73
|
|
|
Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
|
|
|
@@ -67,6 +69,10 @@ Patch0: nginx-auto-cc-gcc.patch
|
|
|
# to fix https://svn.boost.org/trac/boost/ticket/8731
|
|
|
Patch100: boost-changeset_84950.diff
|
|
|
|
|
|
+# to fix compile error with C++11.
|
|
|
+Patch1000: passenger-5.0.28-boost.patch
|
|
|
+
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
BuildRequires: pcre-devel
|
|
|
@@ -146,6 +152,10 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
|
|
|
# %patch100 -p2
|
|
|
# popd
|
|
|
|
|
|
+pushd passenger-%{passenger_version}
|
|
|
+%patch1000 -p1
|
|
|
+popd
|
|
|
+
|
|
|
%build
|
|
|
# nginx does not utilize a standard configure script. It has its own
|
|
|
# and the standard configure options cause the nginx configure script
|
|
|
@@ -361,6 +371,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Jun 7 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-1
|
|
|
+- updated to 1.10.1.
|
|
|
+- updated passenger to 5.0.28.
|
|
|
+
|
|
|
* Wed Apr 20 2016 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.15-1
|
|
|
- updated to 1.9.15
|
|
|
|
tomop