diff --git a/avahi.spec b/avahi.spec index 3b2e1e3..65ba069 100644 --- a/avahi.spec +++ b/avahi.spec @@ -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 @@ License: LGPL 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 @@ necessary for developing programs using avahi with Qt3. 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 @@ necessary for developing programs using avahi. %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 @@ rm -rf $RPM_BUILD_ROOT %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 @@ fi %{_includedir}/avahi-qt3 %changelog +* Fri Oct 28 2005 Jason Vas Dias - 0.5.2-3 +- change initscript to start avahi-daemon AFTER messagebus + * Wed Oct 26 2005 Karsten Hopp 0.5.2-2 - add buildrequires dbus-python