From 226db407b7158b598dde2ab12e2a6a360c81ba0e Mon Sep 17 00:00:00 2001
From: jvdias <jvdias@fedoraproject.org>
Date: Fri, 17 Feb 2006 17:39:31 +0000
Subject: [PATCH] upgrade to 0.6.7; fix avahi-dnsconfd initscript

---
 .cvsignore |  1 +
 avahi.spec | 42 ++++++++++++++++++++++++++++++++----------
 sources    |  2 +-
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 947ce99..7fd24bc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ avahi-0.6.3.tar.gz
 avahi-0.6.4.tar.gz
 avahi-0.6.5.tar.gz
 avahi-0.6.6.tar.gz
+avahi-0.6.7.tar.gz
diff --git a/avahi.spec b/avahi.spec
index 38c94de..fb20002 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -3,8 +3,8 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.6
-Release: 	4
+Version:        0.6.7
+Release: 	1
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -29,6 +29,7 @@ Patch8:		avahi-0.6.3-lockfile.patch
 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
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -115,19 +116,28 @@ necessary for developing programs using avahi.
 %setup -q
 #%patch1 -p1 -b .fedora
 #^- this patch now upstream
-%patch2 -p1 -b .start_after_dbus
-%patch3 -p1 -b .initscript_status
+#%patch2 -p1 -b .start_after_dbus
+#^- this patch now upstream
+#%patch3 -p1 -b .initscript_status
+#^- this patch now upstream
 #%patch4 -p1 -b .dbus-0.6
 #^- this patch now upstream
-%patch5 -p1 -b .bz177148
+#%patch5 -p1 -b .bz177148
+#^- this patch now upstream
 %if %{WITH_MONO}
 %patch6 -p1 -b .MONO_SHARED_DIR
 %endif
-%patch7 -p1 -b .i18n
-%patch8 -p1 -b .lockfile
-%patch9 -p1 -b .localtime
-%patch10 -p1 -b .bz178746
-%patch11 -p1 -b .bz179448
+#%patch7 -p1 -b .i18n
+#^- this patch now upstream
+#%patch8 -p1 -b .lockfile
+#^- this patch now upstream
+#%patch9 -p1 -b .localtime
+#^- this patch now upstream
+#%patch10 -p1 -b .bz178746
+#^- this patch now upstream
+#%patch11 -p1 -b .bz179448
+#^- this patch now upstream
+%patch12 -p1 -b .initscript
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -192,6 +202,11 @@ if [ "$1" -eq 1 ]; then
    # if user has not configured avahi service at all 
 	/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1
    fi;
+   if ! /sbin/chkconfig --list avahi-dnsconfd >/dev/null 2>&1 ; then
+   # 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
+   fi;
 #  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
@@ -207,6 +222,7 @@ elif [ "$1" -gt 1 ]; then
 #  so it got started AFTER messagebus ( 97 ) and was unable to start.
 #  It now has 'chkconfig: 345 98 02'.
    /sbin/service avahi-daemon condrestart >/dev/null 2>&1
+   /sbin/service avahi-dnsconfd condrestart >/dev/null 2>&1
 fi;
 
 %postun -p /sbin/ldconfig
@@ -215,6 +231,8 @@ fi;
 if [ "$1" -eq 0 ]; then
     service avahi-daemon stop > /dev/null 2>&1
     /sbin/chkconfig --del avahi-daemon
+    service avahi-dnsconfd stop >/dev/null 2>&1
+    /sbin/chkconfig --del avahi-dnsconfd
 fi
 
 %post glib -p /sbin/ldconfig
@@ -232,6 +250,7 @@ fi
 %dir %{_sysconfdir}/avahi
 %dir %{_sysconfdir}/avahi/etc
 %ghost %{_sysconfdir}/avahi/etc/localtime
+%{_sysconfdir}/avahi/hosts
 %dir %{_sysconfdir}/avahi/services
 %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
@@ -302,6 +321,9 @@ fi
 %endif
 
 %changelog
+* Fri Feb 17 2006 Jason Vas Dias <jvdias@redhat.com> 0.6.7-1
+- Upgrade to upstream version 0.6.7
+
 * Fri Feb 17 2006 Karsten Hopp <karsten@redhat.de> 0.6.6-4
 - BuildRequires pygtk2
 
diff --git a/sources b/sources
index 9228cc0..4d72d2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7fd8c4a4c3715fa7f9cc2f939ef122d  avahi-0.6.6.tar.gz
+4cfb24b5c9063180f9eee2ef30beac53  avahi-0.6.7.tar.gz