fix bug 175352

This commit is contained in:
jvdias 2005-12-09 21:27:55 +00:00
parent ca4cf5592a
commit 40e87b2833

View File

@ -1,6 +1,6 @@
Name: avahi Name: avahi
Version: 0.6.1 Version: 0.6.1
Release: 1 Release: 2
Summary: Local network service discovery Summary: Local network service discovery
Group: System Environment/Base Group: System Environment/Base
@ -142,12 +142,18 @@ rm -rf $RPM_BUILD_ROOT
%post %post
/sbin/ldconfig /sbin/ldconfig
if [ "$1" -eq 1 ]; then 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. # We should realy make dbus reload the system.d config here. Dunno how though.
# kill -HUP `cat /var/run/messagebus.pid` ? # kill -HUP `cat /var/run/messagebus.pid` ?
elif [ "$1" -gt 1 ]; then elif [ "$1" -gt 1 ]; then
# reset initscript run order: if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then
LC_ALL=C /sbin/chkconfig --levels=0123456 avahi-daemon reset >/dev/null 2>&1 # 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', # 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. # so it got started AFTER messagebus ( 97 ) and was unable to start.
# It now has 'chkconfig: 345 98 02'. # It now has 'chkconfig: 345 98 02'.
@ -237,7 +243,11 @@ fi
%{_includedir}/avahi-qt3 %{_includedir}/avahi-qt3
%changelog %changelog
* Wed Dec 12 2005 Jason Vas Dias<jvdias@redhat.com> - 0.6.1-1 * Fri Dec 09 2005 Jason Vas Dias<jvdias@redhat.com> - 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<jvdias@redhat.com> - 0.6.1-1
- Upgrade to 0.6.1 - Upgrade to 0.6.1
* Mon Dec 05 2005 Jason Vas Dias<jvdias@redhat.com> - 0.6-6 * Mon Dec 05 2005 Jason Vas Dias<jvdias@redhat.com> - 0.6-6