diff --git a/nginx.spec b/nginx.spec index 4823bee..e9cdd08 100644 --- a/nginx.spec +++ b/nginx.spec @@ -25,7 +25,6 @@ License: BSD URL: http://nginx.org/ Source0: https://nginx.org/download/nginx-%{version}.tar.gz -Source1: https://nginx.org/download/nginx-%{version}.tar.gz.asc Source10: nginx.service Source11: nginx.logrotate Source12: nginx.conf @@ -172,12 +171,11 @@ Requires: nginx %prep %setup -q %patch0 -p0 -cp %{SOURCE200} . -cp %{SOURCE210} . +cp %{SOURCE200} %{SOURCE210} %{SOURCE10} %{SOURCE12} . -%if 0%{?rhel} < 8 -sed -i -e 's#KillMode=.*#KillMode=process#g' %{SOURCE10} -sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' %{SOURCE12} +%if 0%{?rhel} > 0 && 0%{?rhel} < 8 +sed -i -e 's#KillMode=.*#KillMode=process#g' nginx.service +sed -i -e 's#PROFILE=SYSTEM#HIGH:!aNULL:!MD5#' nginx.conf %endif @@ -251,7 +249,7 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f '{}' \; find %{buildroot} -type f -empty -exec rm -f '{}' \; find %{buildroot} -type f -iname '*.so' -exec chmod 0755 '{}' \; -install -p -D -m 0644 %{SOURCE10} \ +install -p -D -m 0644 ./nginx.service \ %{buildroot}%{_unitdir}/nginx.service install -p -D -m 0644 %{SOURCE11} \ %{buildroot}%{_sysconfdir}/logrotate.d/nginx @@ -267,7 +265,7 @@ install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/html install -p -d -m 0755 %{buildroot}%{_datadir}/nginx/modules install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules -install -p -m 0644 %{SOURCE12} \ +install -p -m 0644 ./nginx.conf \ %{buildroot}%{_sysconfdir}/nginx install -p -m 0644 %{SOURCE100} \ %{buildroot}%{_datadir}/nginx/html diff --git a/sources b/sources index 4fdf958..955fc06 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (nginx-1.12.0.tar.gz) = e2e930b61491d91090090d4716740895fc7812e8e266c427ac2b40c5a70493150e5c81e769c6b7563baf5f0e15b32fae8f2b11fd5699e468e1cc40706defb8ee -SHA512 (nginx-1.12.0.tar.gz.asc) = 52ef5a46e7e819ca2d74796c6fed8dd1378ae3d65f07a4218493dbd0ac0f219f4ec7e6e4b4553832471f4a337e6e1498f8aa69227f67d86f50df3725d2e92b17 SHA512 (nginx-1.12.1.tar.gz) = 3a2ad2a559b366dda92dd58c0fe40ee84dd60a3eaf72071454110e032c3e9a03f2a63b28fe3a615b527950521eeb533c687a2cc4c87524e1d8f3a0a5f043fdb6