diff --git a/avahi.spec b/avahi.spec index 1d9d16f..7bbe397 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,6 +1,6 @@ Name: avahi Version: 0.6 -Release: 4 +Release: 5 Summary: Local network service discovery Group: System Environment/Base @@ -29,7 +29,7 @@ convenient. %package tools Summary: Tools for mDNS browsing and publishing Group: System Environment/Base -Requires: %{name} = %{version}, gtk2, pygtk2, libglade2, pygtk2-libglade, python-twisted +Requires: %{name} = %{version}, gtk2, pygtk2, libglade2, pygtk2-libglade %description tools Tools that use avahi to browse and publish mDNS services and hosts. @@ -102,7 +102,7 @@ libtoolize --force automake-1.9 --add-missing autoconf -%configure --with-distro=fedora --disable-qt4 --disable-mono --disable-monodoc --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl +%configure --with-distro=fedora --disable-qt4 --disable-mono --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl make %{?_smp_mflags} @@ -125,6 +125,12 @@ 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} +# remove avahi-bookmarks - unusable without python-twisted, +# which has been judged dangerous and is removed from the +# Fedora Core distribution: +rm -f $RPM_BUILD_ROOT/%{_bindir}/avahi-bookmarks $RPM_BUILD_ROOT/%{_mandir}/man1/avahi-bookmarks* +:; + %clean rm -rf $RPM_BUILD_ROOT @@ -234,6 +240,12 @@ fi %{_includedir}/avahi-qt3/* %changelog +* Fri Dec 02 2005 Jason Vas Dias - 0.6-5 +- python-twisted has been removed from the FC-5 distribution - disable its use + +* Thu Dec 01 2005 Jason Vas Dias - 0.6-4 +- Rebuild for dbus-0.6 - remove use of DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT + * Wed Nov 30 2005 Jason Vas Dias - 0.6-3 - fix bug 172047 - tools should require python-twisted - fix bug 173985 - docs directory permissions