rpms/avahi/devel avahi-0.6.3-bz177148.patch, NONE, 1.1 avahi.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.3-bz177148.patch 
Log Message:
Upgrade to 0.6.3; fix bug 177148

avahi-0.6.3-bz177148.patch:
 avahi-daemon |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE avahi-0.6.3-bz177148.patch ---
--- avahi-0.6.3/initscript/fedora/avahi-daemon.bz177148	2006-01-09 11:21:07.834745000 -0500
+++ avahi-0.6.3/initscript/fedora/avahi-daemon	2006-01-09 14:51:54.115520000 -0500
@@ -27,6 +27,11 @@
 
 start() {
 	echo -n $"Starting Avahi daemon... "
+	if [ -f /var/run/avahi-daemon/pid ] && avpid=`cat /var/run/avahi-daemon/pid` && [ -d /proc/$avpid ] && [ `readlink /proc/$avpid/exe` = '/usr/sbin/avahi-daemon' ]; then
+	    success;
+	    echo;
+	    return 0;
+	fi;
         $AVAHI_BIN -D
 	RETVAL=$?
 	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- avahi.spec	9 Jan 2006 16:25:30 -0000	1.22
+++ avahi.spec	9 Jan 2006 19:54:38 -0000	1.23
@@ -14,6 +14,7 @@
 Patch2:		avahi-0.5.2-start_after_dbus.patch
 Patch3:         avahi-0.6-initscript_status.patch
 Patch4:         avahi-0.6-dbus-0.6.patch
+Patch5:         avahi-0.6.3-bz177148.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -92,6 +93,7 @@
 %patch3 -p1 -b .initscript_status
 #%patch4 -p1 -b .dbus-0.6
 #^- this patch now upstream
+%patch5 -p1 -b .bz177148
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -248,7 +250,8 @@
 %changelog
 * Mon Jan 09 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.3-1
 - Upgrade to upstream version 0.6.3
-
+- fix bug 177148: initscript start should not fail if avahi-daemon running
+ 
 * Thu Dec 22 2005 Jason Vas Dias <jvdias at redhat.com> - 0.6.1-3
 - move initscripts from /etc/init.d to /etc/rc.d/init.d