Update to 1.7.10

nginx.spec

@@ -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.2
+Version:           1.7.10
-Release:           4%{?dist}
+Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -76,16 +70,10 @@ Requires:          perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $ve
 Requires(pre):     nginx-filesystem
 Provides:          webserver
 
-%if 0%{?with_systemd}
 BuildRequires:     systemd
 Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
-%else
-Requires(post):    chkconfig
-Requires(preun):   chkconfig, initscripts
-Requires(postun):  initscripts
-%endif
 
 %description
 Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
@@ -126,13 +114,8 @@ 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}
     --pid-path=/run/nginx.pid \
     --lock-path=/run/lock/subsys/nginx \
-%else
-    --pid-path=%{_localstatedir}/run/nginx.pid \
-    --lock-path=%{_localstatedir}/lock/subsys/nginx \
-%endif
     --user=%{nginx_user} \
     --group=%{nginx_group} \
 %if 0%{?with_aio}
@@ -177,15 +160,8 @@ 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}
 install -p -D -m 0644 %{SOURCE10} \
     %{buildroot}%{_unitdir}/nginx.service
-%else
-install -p -D -m 0755 %{SOURCE15} \
-    %{buildroot}%{_initrddir}/nginx
-install -p -D -m 0644 %{SOURCE16} \
-    %{buildroot}%{_sysconfdir}/sysconfig/nginx
-%endif
 
 install -p -D -m 0644 %{SOURCE11} \
     %{buildroot}%{_sysconfdir}/logrotate.d/nginx
@@ -226,13 +202,7 @@ getent passwd %{nginx_user} > /dev/null || \
 exit 0
 
 %post
-%if 0%{?with_systemd}
 %systemd_post nginx.service
-%else
-if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add %{name}
-fi
-%endif
 if [ $1 -eq 2 ]; then
     # Make sure these directories are not world readable.
     chmod 700 %{nginx_home}
@@ -241,23 +211,10 @@ if [ $1 -eq 2 ]; then
 fi
 
 %preun
-%if 0%{?with_systemd}
 %systemd_preun nginx.service
-%else
-if [ $1 -eq 0 ]; then
-    /sbin/service %{name} stop >/dev/null 2>&1
-    /sbin/chkconfig --del %{name}
-fi
-%endif
 
 %postun
-%if 0%{?with_systemd}
 %systemd_postun nginx.service
-%else
-if [ $1 -eq 2 ]; then
-    /sbin/service %{name} upgrade || :
-fi
-%endif
 
 %files
 %doc LICENSE CHANGES README
@@ -270,12 +227,7 @@ fi
 %{_mandir}/man3/nginx.3pm*
 %{_mandir}/man8/nginx.8*
 %{_mandir}/man8/nginx-upgrade.8*
-%if 0%{?with_systemd}
 %{_unitdir}/nginx.service
-%else
-%{_initrddir}/nginx
-%config(noreplace) %{_sysconfdir}/sysconfig/nginx
-%endif
 %config(noreplace) %{nginx_confdir}/fastcgi.conf
 %config(noreplace) %{nginx_confdir}/fastcgi.conf.default
 %config(noreplace) %{nginx_confdir}/fastcgi_params
@@ -308,6 +260,10 @@ fi
 
 
 %changelog
+* Sun Feb 15 2015 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.7.10-1
+- update to upstream release 1.7.10
+- remove systemd conditionals
+
 * Wed Oct 22 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-4
 - fix package ownership of directories