rpms/redis
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleanup leftovers from removed sentinel macro

Browse Source
This commit is contained in:
Haïkel Guémar 2015-02-27 20:39:24 +01:00
parent 309201a777
commit 1cd925bb3b
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
redis.spec
View File

@ -12,7 +12,7 @@
Name: redis Name: redis
Version: 2.8.19 Version: 2.8.19
Release: 1%{?dist} Release: 1%{?dist}.1
Summary: A persistent key-value database Summary: A persistent key-value database
License: BSD License: BSD
URL: http://redis.io URL: http://redis.io
@ -140,9 +140,7 @@ install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
# Install configuration files. # Install configuration files.
install -pDm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf install -pDm644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
%if 0%{?with_sentinel}
install -pDm644 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf install -pDm644 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf
%endif
# Install Systemd unit files. # Install Systemd unit files.
%if 0%{?with_systemd} %if 0%{?with_systemd}
@ -174,10 +172,8 @@ install -pDm755 %{S:7} %{buildroot}%{_bindir}/%{name}-shutdown
%check %check
%if 0%{?with_tests} %if 0%{?with_tests}
make test ||: make test ||:
%if 0%{?with_sentinel}
make test-sentinel ||: make test-sentinel ||:
%endif %endif
%endif
%pre %pre
getent group %{name} &> /dev/null || \ getent group %{name} &> /dev/null || \
@ -193,10 +189,8 @@ exit 0
%systemd_post %{name}-sentinel.service %systemd_post %{name}-sentinel.service
%else %else
chkconfig --add %{name} chkconfig --add %{name}
%if 0%{?with_sentinel}
chkconfig --add %{name}-sentinel chkconfig --add %{name}-sentinel
%endif %endif
%endif
%preun %preun
%if 0%{?with_systemd} %if 0%{?with_systemd}
@ -206,11 +200,9 @@ chkconfig --add %{name}-sentinel
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
service %{name} stop &> /dev/null service %{name} stop &> /dev/null
chkconfig --del %{name} &> /dev/null chkconfig --del %{name} &> /dev/null
%if 0%{?with_sentinel}
service %{name}-sentinel stop &> /dev/null service %{name}-sentinel stop &> /dev/null
chkconfig --del %{name}-sentinel &> /dev/null chkconfig --del %{name}-sentinel &> /dev/null
%endif %endif
%endif
%postun %postun
%if 0%{?with_systemd} %if 0%{?with_systemd}
@ -219,9 +211,7 @@ chkconfig --del %{name}-sentinel &> /dev/null
%else %else
if [ "$1" -ge "1" ] ; then if [ "$1" -ge "1" ] ; then
service %{name} condrestart >/dev/null 2>&1 || : service %{name} condrestart >/dev/null 2>&1 || :
%if 0%{?with_sentinel}
service %{name}-sentinel condrestart >/dev/null 2>&1 || : service %{name}-sentinel condrestart >/dev/null 2>&1 || :
%endif
fi fi
%endif %endif
@ -231,12 +221,10 @@ fi
%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README %doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
%if 0%{?with_sentinel}
%attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf %attr(0644, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
%endif %dir %attr(0755, redis, redis) %{_sharedstatedir}/%{name}
%dir %attr(0750, redis, redis) %{_sharedstatedir}/%{name} %dir %attr(0755, redis, redis) %{_localstatedir}/log/%{name}
%dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name} %dir %attr(0755, redis, redis) %{_localstatedir}/run/%{name}
%dir %attr(0750, redis, redis) %{_localstatedir}/run/%{name}
%{_bindir}/%{name}-* %{_bindir}/%{name}-*
%if 0%{?with_systemd} %if 0%{?with_systemd}
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf