rpms/spamassassin
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add systemd macros for presets. Fixes bug #850320

Browse Source
This commit is contained in:
Kevin Fenzi 2012-08-25 14:02:21 -06:00
parent 70956222cb
commit 5fe3149294
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spamassassin.spec
View File

@ -69,7 +69,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin Name: spamassassin
Version: 3.3.2 Version: 3.3.2
#Release: 0.8.%{prerev}%{?dist} #Release: 0.8.%{prerev}%{?dist}
Release: 12%{?dist} Release: 13%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Applications/Internet Group: Applications/Internet
URL: http://spamassassin.apache.org/ URL: http://spamassassin.apache.org/
@ -286,11 +286,15 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%if %{use_systemd} %if %{use_systemd}
%if 0%{?fedora} > 17
%systemd_post spamassassin.service
%else
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
# Initial installation # Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi fi
%endif %endif
%endif
# -a and --auto-whitelist options were removed from 3.0.0 # -a and --auto-whitelist options were removed from 3.0.0
# prevent service startup failure # prevent service startup failure
@ -318,12 +322,16 @@ exit 0
%endif %endif
%if %{use_systemd} %if %{use_systemd}
%if 0%{?fedora} > 17
%systemd_postun spamassassin.service
%else
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall # Package upgrade, not uninstall
/bin/systemctl try-restart spamassassin.service >/dev/null 2>&1 || : /bin/systemctl try-restart spamassassin.service >/dev/null 2>&1 || :
fi fi
%endif %endif
%endif
%preun %preun
%if %{use_systemd} == 0 %if %{use_systemd} == 0
@ -335,12 +343,16 @@ exit 0
%endif %endif
%if %{use_systemd} %if %{use_systemd}
%if 0%{?fedora} > 17
%systemd_preun spamassassin.service
%else
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
# Package removal, not upgrade # Package removal, not upgrade
/bin/systemctl --no-reload disable spamassassin.service > /dev/null 2>&1 || : /bin/systemctl --no-reload disable spamassassin.service > /dev/null 2>&1 || :
/bin/systemctl stop spamassassin.service > /dev/null 2>&1 || : /bin/systemctl stop spamassassin.service > /dev/null 2>&1 || :
fi fi
%endif %endif
%endif
%if %{use_systemd} %if %{use_systemd}
%triggerun -- spamassassin < 3.3.2-2 %triggerun -- spamassassin < 3.3.2-2
@ -352,6 +364,9 @@ fi
%endif %endif
%changelog %changelog
* Sat Aug 25 2012 Kevin Fenzi <kevin@scrye.com> 3.3.2-13
- Add systemd macros for presets. Fixes bug #850320
* Fri Aug 03 2012 Kevin Fenzi <kevin@scrye.com> - 3.3.2-12 * Fri Aug 03 2012 Kevin Fenzi <kevin@scrye.com> - 3.3.2-12
- Fix sa-update not detecting spamd running. Fixes bug #755644 - Fix sa-update not detecting spamd running. Fixes bug #755644
- Add restart=always to systemd file to work around upstream bug. Bug #812359 - Add restart=always to systemd file to work around upstream bug. Bug #812359