diff --git a/fedora/SPECS/nginx.spec b/fedora/SPECS/nginx.spec index 6e5424e..b059152 100644 --- a/fedora/SPECS/nginx.spec +++ b/fedora/SPECS/nginx.spec @@ -17,8 +17,8 @@ Name: nginx Epoch: 1 -Version: 1.13.12 -Release: 3%{?dist} +Version: 1.14.0 +Release: 1%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -49,6 +49,7 @@ Source210: UPGRADE-NOTES-1.6-to-1.10 # removes -Werror in upstream build scripts. -Werror conflicts with # -D_FORTIFY_SOURCE=2 causing warnings to turn into errors. Patch0: nginx-auto-cc-gcc.patch +Patch1: ngx_user_crypt.patch %if 0%{?with_gperftools} BuildRequires: gperftools-devel @@ -206,6 +207,9 @@ Modsecurity module for nginx %endif %setup -q %patch0 -p0 +%if 0%{?fedora} > 27 +%patch1 -p1 +%endif cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} . %if 0%{?rhel} > 0 && 0%{?rhel} < 8 @@ -526,6 +530,10 @@ fi [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/* %changelog +* Mon Jul 30 2018 Daniel Steiner 1.14.0-1 +- Updated to lates nginx version +- Compiled on Fedora 28 + * Sun Apr 15 2018 Daniel Steiner 1.13.12-3 - Modsecurity module added as a shared module.