From a17ac137da3284192df45db66025f2e3f72a9b11 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Jan 25 2010 20:01:06 +0000
Subject: Move avahi-discover from avahi-tools to avahi-ui-tools


---

diff --git a/avahi.spec b/avahi.spec
index dd8264e..b32c5c2 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.25
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Local network service discovery
 Group:          System Environment/Base
 License:        LGPLv2
@@ -53,7 +53,7 @@ convenient.
 %package tools
 Summary: Command line tools for mDNS browsing and publishing
 Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}, gtk2, pygtk2, pygtk2-libglade, gdbm, python, dbus-python
+Requires: %{name} = %{version}-%{release}
 
 %description tools
 Command line tools that use avahi to browse and publish mDNS services.
@@ -65,6 +65,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: %{name}-ui = %{version}-%{release}
 Requires: vnc
 Requires: openssh-clients
+Requires: gtk2, pygtk2, pygtk2-libglade, gdbm, python, dbus-python
 
 %description ui-tools
 Graphical user interface tools that use Avahi to browse for mDNS services.
@@ -452,19 +453,23 @@ fi
 %files tools
 %defattr(0644, root, root, 0755)
 %attr(0755,root,root) %{_bindir}/*
-# These are .py files only, so they don't go in lib64
-%{_prefix}/lib/python?.?/site-packages/*
 %{_mandir}/man1/*
-%{_datadir}/avahi/interfaces/
 %exclude %{_bindir}/avahi-discover-standalone
 %exclude %{_bindir}/b*
+%exclude %{_bindir}/avahi-discover
 %exclude %{_mandir}/man1/b*
+%exclude %{_mandir}/man1/avahi-discover*
 
 %files ui-tools
 %defattr(0644, root, root, 0755)
 %attr(0755,root,root) %{_bindir}/b*
+%attr(0755,root,root) %{_bindir}/avahi-discover
 %{_mandir}/man1/b*
+%{_mandir}/man1/avahi-discover*
 %{_datadir}/applications/b*.desktop
+# These are .py files only, so they don't go in lib64
+%{_prefix}/lib/python?.?/site-packages/*
+%{_datadir}/avahi/interfaces/
 
 %files devel
 %defattr(0644, root, root, 0755)
@@ -572,6 +577,10 @@ fi
 %endif
 
 %changelog
+* Mon Jan 25 2010 Lennart Poettering <lpoetter@redhat.com> - 0.6.25-6
+- Move avahi-discover from avahi-tools to avahi-ui-tools
+- https://bugzilla.redhat.com/show_bug.cgi?id=513768
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.25-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild