From f81f43591f3b2f14a466a6b79f57f44a63579d89 Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Mon, 20 Mar 2006 22:50:55 +0000
Subject: [PATCH] fix bugs 185965, 185972

---
 avahi.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/avahi.spec b/avahi.spec
index 5a98749..756136c 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -4,7 +4,7 @@
 %endif
 Name:           avahi
 Version:        0.6.9
-Release: 	6
+Release: 	8.FC6
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -31,6 +31,7 @@ Patch9: 	avahi-0.6.4-localtime.patch
 Patch10:	avahi-0.6.4-bz178784.patch
 Patch11:        avahi-0.6.5-bz179448.patch
 Patch12:	avahi-0.6.7-initscript.patch
+Patch13: 	avahi-0.6.9-bz185972.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -139,6 +140,7 @@ necessary for developing programs using avahi.
 #%patch11 -p1 -b .bz179448
 #^- this patch now upstream
 %patch12 -p1 -b .initscript
+%patch13 -p1 -b .bz185972
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -203,12 +205,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
+# Run avahi-daemon by default:
+/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 || :;
+# avahi-dnsconfd NOT run by default in any runlevel; add it
+# so system-config-services can see it
+/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 || :;
 if [ "$1" -eq 1 ]; then
-   # Run avahi-daemon by default:
-   /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 || :;
-   # avahi-dnsconfd NOT run by default in any runlevel; add it
-   # so system-config-services can see it
-   /sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 || :;
 #  We should realy make dbus reload the system.d config here. Dunno how though.
 #  kill -HUP `cat /var/run/messagebus.pid` ? 
    if [ -s /etc/localtime ]; then
@@ -319,6 +321,10 @@ fi
 %endif
 
 %changelog
+* Mon Mar 20 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.9-8.FC6
+- fix bug 185972: remove ellipses in initscript
+- fix bug 185965: make chkconfigs unconditional
+
 * Thu Mar 16 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.9-6
 - Fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir}