From 72706a418943f460cb5c831188492786af15588e Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Wed, 27 Apr 2016 12:30:00 +0100 Subject: [PATCH] Only Require nginx-all-modules for EPEL and current Fedora releases --- nginx.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nginx.spec b/nginx.spec index f83a622..d993b75 100644 --- a/nginx.spec +++ b/nginx.spec @@ -18,7 +18,7 @@ Name: nginx Epoch: 1 Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons @@ -54,8 +54,10 @@ BuildRequires: zlib-devel Requires: nginx-filesystem = %{epoch}:%{version}-%{release} +%if 0%{?rhel} || 0%{?fedora} < 24 # Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later. Requires: nginx-all-modules = %{epoch}:%{version}-%{release} +%endif Requires: openssl Requires: pcre @@ -89,6 +91,14 @@ Requires: nginx-mod-stream = %{epoch}:%{version}-%{release} %description all-modules %{summary}. +%if 0%{?rhel} +The main nginx package depends on this to ease the upgrade path. After a grace +period of several months, modules will become optional. +%endif +%if 0%{?fedora} && 0%{?fedora} < 24 +The main nginx package depends on this to ease the upgrade path. Starting from +Fedora 24, modules are optional. +%endif %package filesystem Group: System Environment/Daemons @@ -163,6 +173,10 @@ Requires: nginx %patch0 -p0 cp %{SOURCE200} . +%if 0%{?rhel} < 8 +sed -i -e 's#KillMode=.*#KillMode=process#g' %{SOURCE10} +%endif + %build # nginx does not utilize a standard configure script. It has its own @@ -409,6 +423,9 @@ fi %changelog +* Wed Apr 27 2016 Jamie Nguyen - 1:1.10.0-2 +- only Require nginx-all-modules for EPEL and current Fedora releases + * Wed Apr 27 2016 Jamie Nguyen - 1:1.10.0-1 - update to upstream release 1.10.0 - split dynamic modules into subpackages