rpms/avahi/devel avahi-0.5.2-start_after_dbus.patch, NONE, 1.1 avahi.spec, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.5.2-start_after_dbus.patch 
Log Message:
change avahi-daemon initscript to start after messagebus

avahi-0.5.2-start_after_dbus.patch:
 avahi-daemon.in   |    2 +-
 avahi-dnsconfd.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE avahi-0.5.2-start_after_dbus.patch ---
--- avahi-0.5.2/initscript/fedora/avahi-daemon.in.start_after_dbus	2005-10-28 18:44:31.000000000 -0400
+++ avahi-0.5.2/initscript/fedora/avahi-daemon.in	2005-10-28 18:44:56.000000000 -0400
@@ -2,7 +2,7 @@
 #
 # avahi-daemon:       Starts the Avahi Daemon
 #
-# chkconfig: 345 34 66
+# chkconfig: 345 98 02
 # description: This is a daemon which runs on client machines to perform \
 #              Zeroconf service discovery on a network. avahi-daemon must be \
 #              running on systems  that use Avahi for service discovery. \
--- avahi-0.5.2/initscript/fedora/avahi-dnsconfd.in.start_after_dbus	2005-10-28 18:44:31.000000000 -0400
+++ avahi-0.5.2/initscript/fedora/avahi-dnsconfd.in	2005-10-28 18:45:09.000000000 -0400
@@ -2,7 +2,7 @@
 #
 # avahi-daemon:       Starts the Avahi dns configuration daemon
 #
-# chkconfig: - 34 66
+# chkconfig: - 34 98 02
 # description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
 #       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
 #       on the local LAN. This is useful for configuring unicast DNS servers in


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avahi.spec	26 Oct 2005 09:44:57 -0000	1.3
+++ avahi.spec	28 Oct 2005 23:28:55 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           avahi
 Version:        0.5.2
-Release:        2
+Release:        3
 Summary:        local network service discovery 
 
 Group:          System Environment/Base
@@ -8,10 +8,13 @@
 URL:            http://www.freedesktop.org/Software/Avahi
 Source0:        %{name}-%{version}.tar.gz
 Patch1:		avahi-0.5.2-fedora.patch
+Patch2:         avahi-0.5.2-start_after_dbus.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen, gtk2-devel, qt-devel, libdaemon-devel, dbus-devel, expat-devel, python, dbus-python
+
 Requires:       dbus
+Obsoletes:	howl, howl-libs
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -72,6 +75,7 @@
 Summary: libraries and header files for avahi development
 Group: Development/Libraries
 Requires: %{name} = %{version}
+Obsoletes: howl-devel
 
 %description devel
 The avahi-devel package contains the header files and libraries
@@ -82,6 +86,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .fedora
+%patch2 -p1 -b .start_after_dbus
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -117,8 +122,18 @@
 
 %post
 /sbin/ldconfig
-# We should realy makee dbus reload the system.d config here. Dunno how though.
-/sbin/chkconfig --add avahi-daemon
+if [ "$1" -eq 1 ]; then
+   /sbin/chkconfig --add avahi-daemon >/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` ?   
+elif [ "$1" -gt 1 ]; then
+#  reset initscript run order:
+   LC_ALL=C /sbin/chkconfig --levels=0123456 avahi-daemon reset >/dev/null 2>&1
+#  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'.
+   /sbin/service avahi-daemon condrestart >/dev/null 2>&1
+fi;
 
 %postun
 /sbin/ldconfig
@@ -184,6 +199,9 @@
 %{_includedir}/avahi-qt3
 
 %changelog
+* Fri Oct 28 2005 Jason Vas Dias<jvdias at redhat.com> - 0.5.2-3
+- change initscript to start avahi-daemon AFTER messagebus
+
 * Wed Oct 26 2005 Karsten Hopp <karsten at redhat.de> 0.5.2-2
 - add buildrequires dbus-python