fix bugs 172047 173985

avahi.spec

@@ -1,6 +1,6 @@
 Name:           avahi
 Version:        0.6
-Release:        2
+Release:        3
 Summary:        Local network service discovery 
 
 Group:          System Environment/Base
@@ -9,11 +9,10 @@ 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
+Patch3:         avahi-0.6-initscript_status.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, dbus-devel, expat-devel, python, dbus-python
-
-Requires:       dbus
+BuildRequires:  doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python
+Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
 Obsoletes:	howl, howl-libs
 #Provides:	howl >= 0.9.8, howl-libs >= 0.9.8
 
@@ -29,7 +28,7 @@ convenient.
 %package tools
 Summary: Tools for mDNS browsing and publishing
 Group: System Environment/Base
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}, gtk2, pygtk2, libglade2, pygtk2-libglade, python-twisted
 
 %description tools
 Tools that use avahi to browse and publish mDNS services and hosts.
@@ -92,6 +91,7 @@ necessary for developing programs using avahi.
 #%patch1 -p1 -b .fedora
 #^- this patch now upstream
 %patch2 -p1 -b .start_after_dbus
+%patch3 -p1 -b .initscript_status
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -120,6 +120,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/avahi-discover.desktop
 # create /var/run/avahi-daemon to ensure correct selinux policy for it:
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/avahi-daemon
 
+# remove the documentation directory - let \%doc handle it:
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -229,6 +232,10 @@ fi
 %{_includedir}/avahi-qt3/*
 
 %changelog
+* Wed Nov 30 2005 Jason Vas Dias<jvdias@redhat.com> - 0.6-3
+- fix bug 172047 - tools should require python-twisted
+- fix bug 173985 - docs directory permissions
+
 * Mon Nov 21 2005 Jason Vas Dias<jvdias@redhat.com> - 0.6-1
 - Upgrade to upstream version 0.6 - now provides 'avahi-howl-compat'
   libraries / includes.