rpms/avahi/devel avahi.spec,1.17,1.18

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26248

Modified Files:
	avahi.spec 
Log Message:
fix bug 175352


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- avahi.spec	7 Dec 2005 18:49:56 -0000	1.17
+++ avahi.spec	9 Dec 2005 21:27:55 -0000	1.18
@@ -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 @@
 %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 @@
 %{_includedir}/avahi-qt3
 
 %changelog
-* Wed Dec 12 2005 Jason Vas Dias<jvdias at redhat.com> - 0.6.1-1
+* Fri Dec 09 2005 Jason Vas Dias<jvdias at 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 at redhat.com> - 0.6.1-1
 - Upgrade to 0.6.1
 
 * Mon Dec 05 2005 Jason Vas Dias<jvdias at redhat.com> - 0.6-6