|
@@ -25,7 +25,7 @@
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
Summary: Robust, small and high performance http and reverse proxy server
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
Summary(ja): 堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
|
|
Name: nginx
|
|
Name: nginx
|
|
-Version: 1.15.5
|
|
|
|
|
|
+Version: 1.16.0
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Daemons
|
|
Group: System Environment/Daemons
|
|
@@ -56,7 +56,7 @@ Source1000: ngx-fancyindex-%{ngx_fancyindex_version}.tar.gz
|
|
Source1010: giom-nginx_accept_language_module-%{nginx_accept_language_module_version}.tar.gz
|
|
Source1010: giom-nginx_accept_language_module-%{nginx_accept_language_module_version}.tar.gz
|
|
|
|
|
|
## https://github.com/phusion/passenger/archive/release-%{passenger_version}.tar.gz
|
|
## https://github.com/phusion/passenger/archive/release-%{passenger_version}.tar.gz
|
|
-%define passenger_version 5.3.6
|
|
|
|
|
|
+%define passenger_version 6.0.2
|
|
Source1020: passenger-%{passenger_version}.tar.gz
|
|
Source1020: passenger-%{passenger_version}.tar.gz
|
|
|
|
|
|
%define upstream_fair_version a18b409
|
|
%define upstream_fair_version a18b409
|
|
@@ -65,7 +65,7 @@ Source1030: gnosek-nginx-upstream-fair-%{upstream_fair_version}.tar.gz
|
|
%define mod_wsgi_version 6975f0ec7eeb
|
|
%define mod_wsgi_version 6975f0ec7eeb
|
|
Source2000: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
|
|
Source2000: lifeeth-mod_wsgi-%{mod_wsgi_version}.tar.bz2
|
|
|
|
|
|
-%define nginx_dav_ext_module_version 0.1.0
|
|
|
|
|
|
+%define nginx_dav_ext_module_version 3.0.0
|
|
Source2010: https://github.com/arut/nginx-dav-ext-module/archive/v%{nginx_dav_ext_module_version}.tar.gz#/nginx-dav-ext-module-%{nginx_dav_ext_module_version}.tar.gz
|
|
Source2010: https://github.com/arut/nginx-dav-ext-module/archive/v%{nginx_dav_ext_module_version}.tar.gz#/nginx-dav-ext-module-%{nginx_dav_ext_module_version}.tar.gz
|
|
|
|
|
|
# removes -Werror in upstream build scripts. -Werror conflicts with
|
|
# removes -Werror in upstream build scripts. -Werror conflicts with
|
|
@@ -81,14 +81,13 @@ Patch101: gnosek-nginx-upstream-fair-pull-23.patch
|
|
# to fix compile error with C++11.
|
|
# to fix compile error with C++11.
|
|
Patch1000: passenger-5.0.28-boost.patch
|
|
Patch1000: passenger-5.0.28-boost.patch
|
|
|
|
|
|
-# to fix compile error with curl-7.62.0
|
|
|
|
-Patch1001: passenger-with-curl-7.62.0.patch
|
|
|
|
-
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
|
%if "%{_dist_release}" > "vl6"
|
|
%if "%{_dist_release}" > "vl6"
|
|
BuildRequires: libboost-devel
|
|
BuildRequires: libboost-devel
|
|
%endif
|
|
%endif
|
|
|
|
+BuildRequires: libxcrypt-devel
|
|
|
|
+BuildRequires: libnsl2-devel
|
|
BuildRequires: pcre-devel
|
|
BuildRequires: pcre-devel
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: openssl-devel
|
|
BuildRequires: openssl-devel
|
|
@@ -173,7 +172,6 @@ popd
|
|
%if %{?_dist_release} == "vl7"
|
|
%if %{?_dist_release} == "vl7"
|
|
pushd passenger-%{passenger_version}
|
|
pushd passenger-%{passenger_version}
|
|
#% patch1000 -p1
|
|
#% patch1000 -p1
|
|
-%patch1001 -p1
|
|
|
|
popd
|
|
popd
|
|
%endif
|
|
%endif
|
|
|
|
|
|
@@ -400,6 +398,12 @@ fi
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sun May 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-1
|
|
|
|
+- updated to 1.16.0.
|
|
|
|
+- updated passenger to 6.0.2.
|
|
|
|
+- updated nginx-dav-ext-module to 3.0.0.
|
|
|
|
+- dropped Patch1001: fixed in upstream.
|
|
|
|
+
|
|
* Tue Nov 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15.5-1
|
|
* Tue Nov 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15.5-1
|
|
- updated to 1.15.5.
|
|
- updated to 1.15.5.
|
|
- updated passenger to 5.3.6.
|
|
- updated passenger to 5.3.6.
|