|
|
@@ -25,8 +25,8 @@
|
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
|
Name: nginx
|
|
|
-Version: 1.9.4
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Version: 1.9.9
|
|
|
+Release: 2%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
|
# BSD License (two clause)
|
|
|
@@ -52,7 +52,7 @@ 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.11
|
|
|
+%define passenger_version 5.0.23
|
|
|
Source1020: passenger-%{passenger_version}.tar.gz
|
|
|
%define upstream_fair_version 2131c73
|
|
|
Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
|
|
|
@@ -82,11 +82,7 @@ BuildRequires: curl-devel
|
|
|
BuildRequires: GeoIP-devel
|
|
|
%endif
|
|
|
|
|
|
-%if "%{?_dist_release}" == "vl4"
|
|
|
-Requires: perl >= 5.8.6
|
|
|
-%else
|
|
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
|
|
-%endif
|
|
|
# for /usr/sbin/useradd
|
|
|
Requires(pre): shadow-utils
|
|
|
Requires(post): chkconfig
|
|
|
@@ -146,9 +142,9 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
|
|
|
|
|
|
%patch0 -p0
|
|
|
|
|
|
-pushd passenger-%{passenger_version}/ext/
|
|
|
-%patch100 -p2
|
|
|
-popd
|
|
|
+# pushd passenger-%{passenger_version}/ext/
|
|
|
+# %patch100 -p2
|
|
|
+# popd
|
|
|
|
|
|
%build
|
|
|
# nginx does not utilize a standard configure script. It has its own
|
|
|
@@ -176,7 +172,7 @@ CONFIGOPTS="\
|
|
|
--with-file-aio \
|
|
|
--with-ipv6 \
|
|
|
--with-http_ssl_module \
|
|
|
- --with-http_spdy_module \
|
|
|
+ --with-http_v2_module \
|
|
|
--with-http_realip_module \
|
|
|
--with-http_addition_module \
|
|
|
--with-http_xslt_module \
|
|
|
@@ -217,7 +213,7 @@ CONFIGOPTS="\
|
|
|
./configure \
|
|
|
$CONFIGOPTS \
|
|
|
--with-cc-opt="%{optflags}" \
|
|
|
- --add-module=passenger-%{passenger_version}/ext/nginx
|
|
|
+ --add-module=passenger-%{passenger_version}/src/nginx_module
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
mv objs/nginx objs/nginx.passenger
|
|
|
@@ -365,6 +361,18 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jan 10 2016 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.9-2
|
|
|
+- update passenger to 5.0.23
|
|
|
+
|
|
|
+* Sun Dec 20 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.9-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
+* Sat Dec 5 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.7-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
+* Sat Oct 10 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.5-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
* Sun Aug 23 2015 Munehiro Yamamoto <munepi@vinelinux.org> 1.9.4-1
|
|
|
- new upstream release
|
|
|
|
munepi