|
|
@@ -25,7 +25,7 @@
|
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
|
Name: nginx
|
|
|
-Version: 1.11.3
|
|
|
+Version: 1.11.6
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
|
@@ -69,6 +69,9 @@ Patch0: nginx-auto-cc-gcc.patch
|
|
|
# to fix https://svn.boost.org/trac/boost/ticket/8731
|
|
|
Patch100: boost-changeset_84950.diff
|
|
|
|
|
|
+# to fix https://github.com/gnosek/nginx-upstream-fair/pull/23
|
|
|
+Patch101: gnosek-nginx-upstream-fair-pull-23.patch
|
|
|
+
|
|
|
# to fix compile error with C++11.
|
|
|
Patch1000: passenger-5.0.28-boost.patch
|
|
|
|
|
|
@@ -152,9 +155,15 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
|
|
|
# %patch100 -p2
|
|
|
# popd
|
|
|
|
|
|
+pushd gnosek-nginx-upstream-fair-%{upstream_fair_version}
|
|
|
+%patch101 -p1
|
|
|
+popd
|
|
|
+
|
|
|
+%if %{?_dist_release} == "vl7"
|
|
|
pushd passenger-%{passenger_version}
|
|
|
%patch1000 -p1
|
|
|
popd
|
|
|
+%endif
|
|
|
|
|
|
%build
|
|
|
# nginx does not utilize a standard configure script. It has its own
|
|
|
@@ -371,6 +380,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 19 2016 Munehiro Yamamoto <munepi@vinelinux.org> 1.11.6-1
|
|
|
+- updated to 1.11.6
|
|
|
+- applied gnosek-nginx-upstream-fair-pull-23.patch against nginx-1.11.6
|
|
|
+
|
|
|
* Mon Sep 5 2016 Munehiro Yamamoto <munepi@vinelinux.org> 1.11.3-1
|
|
|
- updated to 1.11.3
|
|
|
- updated passenger to 5.0.30
|
munepi