rpms/nginx
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "systemd is fedora 16+ or EL7"

Browse Source 
This reverts commit 23f650d0c7.
This commit is contained in:
Jamie Nguyen 2014-08-05 15:56:54 +01:00
parent e754ce11f2
commit b074711b52
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nginx.spec
View File

@ -18,16 +18,10 @@
%global with_aio 1
%endif
%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
%global with_systemd 1
%else
%global with_systemd 0
%endif
Name: nginx
Epoch: 1
Version: 1.6.0
Release: 4%{?dist}
Release: 3%{?dist}
Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons
@ -74,7 +68,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $ve
Requires(pre): shadow-utils
Provides: webserver
%if 0%{?with_systemd}
%if 0%{?fedora} >= 16
BuildRequires: systemd
Requires(post): systemd
Requires(preun): systemd
@ -113,7 +107,7 @@ export DESTDIR=%{buildroot}
--http-fastcgi-temp-path=%{nginx_home_tmp}/fastcgi \
--http-uwsgi-temp-path=%{nginx_home_tmp}/uwsgi \
--http-scgi-temp-path=%{nginx_home_tmp}/scgi \
%if 0%{?with_systemd}
%if 0%{?fedora} >= 16
--pid-path=/run/nginx.pid \
--lock-path=/run/lock/subsys/nginx \
%else
@ -164,7 +158,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f '{}' \;
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 '{}' \;
%if 0%{?with_systemd}
%if 0%{?fedora} >= 16
install -p -D -m 0644 %{SOURCE10} \
%{buildroot}%{_unitdir}/nginx.service
%else
@ -207,7 +201,7 @@ getent passwd %{nginx_user} > /dev/null || \
exit 0
%post
%if 0%{?with_systemd}
%if 0%{?fedora} >= 16
%systemd_post nginx.service
%else
if [ $1 -eq 1 ]; then
@ -222,7 +216,7 @@ if [ $1 -eq 2 ]; then
fi
%preun
%if 0%{?with_systemd}
%if 0%{?fedora} >= 16
%systemd_preun nginx.service
%else
if [ $1 -eq 0 ]; then
@ -232,7 +226,7 @@ fi
%endif
%postun
%if 0%{?with_systemd}
%if 0%{?fedora} >= 16
%systemd_postun nginx.service
%else
if [ $1 -eq 2 ]; then
@ -248,7 +242,7 @@ fi
%{_mandir}/man3/nginx.3pm*
%{_mandir}/man8/nginx.8*
%{_mandir}/man8/nginx-upgrade.8*
%if 0%{?with_systemd}
%if 0%{?fedora} >= 16
%{_unitdir}/nginx.service
%else
%{_initrddir}/nginx
@ -281,9 +275,6 @@ fi
%changelog
* Tue Jul 29 2014 Warren Togami <warren@slickage.com> - 1:1.6.0-4
- systemd is fedora 16+ or EL7
* Wed Jul 02 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 1:1.6.0-3
- Fix FTBFS on aarch64 (#1115559)