From 40e87b283300b6c6d6c597dc841a477a68d1c110 Mon Sep 17 00:00:00 2001 From: jvdias Date: Fri, 9 Dec 2005 21:27:55 +0000 Subject: [PATCH] fix bug 175352 --- avahi.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/avahi.spec b/avahi.spec index f7b0a3d..743ceb3 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,6 +1,6 @@ Name: avahi Version: 0.6.1 -Release: 1 +Release: 2 Summary: Local network service discovery Group: System Environment/Base @@ -142,12 +142,18 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig if [ "$1" -eq 1 ]; then - /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 + if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then + # if user has not configured avahi service at all + /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 + fi; # We should realy make dbus reload the system.d config here. Dunno how though. # kill -HUP `cat /var/run/messagebus.pid` ? elif [ "$1" -gt 1 ]; then -# reset initscript run order: - LC_ALL=C /sbin/chkconfig --levels=0123456 avahi-daemon reset >/dev/null 2>&1 + if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then + # if user has not configured avahi service at all + # reset initscript run order: + LC_ALL=C /sbin/chkconfig --levels=0123456 avahi-daemon reset >/dev/null 2>&1 + fi; # pre 0.5.2-3, avahi-daemon initscript had 'chkconfig: 345 34 66', # so it got started AFTER messagebus ( 97 ) and was unable to start. # It now has 'chkconfig: 345 98 02'. @@ -237,7 +243,11 @@ fi %{_includedir}/avahi-qt3 %changelog -* Wed Dec 12 2005 Jason Vas Dias - 0.6.1-1 +* Fri Dec 09 2005 Jason Vas Dias - 0.6.1-2 +- fix bug 175352: Do not chkconfig --add avahi-daemon + if user has already configured it + +* Wed Dec 07 2005 Jason Vas Dias - 0.6.1-1 - Upgrade to 0.6.1 * Mon Dec 05 2005 Jason Vas Dias - 0.6-6