Merge branch 'master' into epel7

2016-07-02 19:52:06 +01:00 · 2016-07-02 19:52:06 +01:00 · 4859abf2bd
parent 950c07b784 37ad8df703
commit 4859abf2bd
1 changed files with 0 additions and 2 deletions
--- a/nginx.spec
+++ b/nginx.spec
@ -173,9 +173,7 @@ Requires:          nginx
 %setup -q
 %patch0 -p0
 cp %{SOURCE200} .
-%if 0%{?rhel} == 7
 cp %{SOURCE210} .
-%endif

 %if 0%{?rhel} < 8
 sed -i -e 's#KillMode=.*#KillMode=process#g' %{SOURCE10}