diff --git a/.gitignore b/.gitignore index 731a1f6..7d4d8bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /aeolus-audrey-agent-0.4.0.tar.gz /aeolus-audrey-agent-0.4.2.tar.gz /aeolus-audrey-agent-0.5.0.tar.gz +/aeolus-audrey-agent-0.5.1.tar.gz diff --git a/aeolus-audrey-agent.spec b/aeolus-audrey-agent.spec index b551574..855af4f 100644 --- a/aeolus-audrey-agent.spec +++ b/aeolus-audrey-agent.spec @@ -20,8 +20,8 @@ %endif Name: aeolus-audrey-agent -Version: 0.5.0 -Release: 0%{?dist}.20120725144606gitc8375fa +Version: 0.5.1 +Release: 1%{?dist} Summary: The Aeolus Audrey Startup Agent Group: Applications/System @@ -46,6 +46,11 @@ Requires: python-setuptools BuildRequires: systemd-units %endif +%if 0%{?fedora} >= 17 +Requires(post): systemd-units +Requires(preun): systemd-units +%endif + BuildArch: noarch %description @@ -87,24 +92,33 @@ fi # in prep for the ZZaudrey service # part of fix for BZ816104 if [ -e %{_initrddir}/audrey ]; then -/sbin/chkconfig --del audrey + /sbin/chkconfig --del audrey fi %post if [ 0%{?rhel} == 05 ] || [ 0%{?rhel} == 06 ]; then -/sbin/chkconfig --add ZZaudrey -/sbin/chkconfig ZZaudrey on + /sbin/chkconfig --add ZZaudrey + /sbin/chkconfig ZZaudrey on else -/bin/systemctl enable audrey.service > /dev/null + %if 0%{?fedora} <= 17 + if [ $1 -eq 1]; then + /bin/systemctl enable audrey.service > /dev/null 2>&1 || : + fi + %else + %systemd_post audrey.service + %endif fi - %preun if [ "$1" = 0 ] ; then if [ 0%{?rhel} == 05 ] || [ 0%{?rhel} == 06 ]; then -/sbin/chkconfig --del ZZaudrey + /sbin/chkconfig --del ZZaudrey else -/bin/systemctl disable audrey.service > /dev/null + %if 0%{?fedora} <= 17 + /bin/systemctl --no-reload disable audrey.service > /dev/null 2>&1 || : + %else + %systemd_preun audrey.service + %endif fi fi @@ -121,6 +135,8 @@ fi %doc COPYING %changelog +* Fri Sep 14 2012 Joe VLcek 0.5.1 +- fix for BZ850389 * Tue May 08 2012 Dan Radez 0.4.6-1 - fix for BZ816104 * Fri Mar 16 2012 Joe VLcek 0.4.4-4 diff --git a/sources b/sources index 08845b8..dc0bd67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0438e7d1328c11c661b43865f6b0fd9c aeolus-audrey-agent-0.5.0.tar.gz +ae3e0cd3181c234f7271c1b6b16bd3a3 aeolus-audrey-agent-0.5.1.tar.gz