From 17b155d49f4acf2f8b9a07fef9638a2cb18bc396 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@fedoraproject.org>
Date: Sun, 12 Aug 2007 19:41:49 +0000
Subject: [PATCH] Fix avahi-browse --help output

---
 avahi-0.6.21-avahi-browse-help-fix.patch | 18 ++++++++++++++++++
 avahi.spec                               | 11 ++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 avahi-0.6.21-avahi-browse-help-fix.patch

diff --git a/avahi-0.6.21-avahi-browse-help-fix.patch b/avahi-0.6.21-avahi-browse-help-fix.patch
new file mode 100644
index 0000000..b700354
--- /dev/null
+++ b/avahi-0.6.21-avahi-browse-help-fix.patch
@@ -0,0 +1,18 @@
+Index: avahi-utils/avahi-browse.c
+===================================================================
+--- avahi-utils/avahi-browse.c	(revision 1518)
++++ avahi-utils/avahi-browse.c	(revision 1519)
+@@ -586,9 +586,12 @@
+                 "%s [options] -a\n"
+                 "%s [options] -D\n"
+ #if defined(HAVE_GDBM) || defined(HAVE_DBM)
+-                "%s [options] -b\n",
++                "%s [options] -b\n"
+ #endif
+                 "\n",
++#if defined(HAVE_GDBM) || defined(HAVE_DBM)
++                argv0,
++#endif
+                 argv0, argv0, argv0);
+ 
+             fprintf(f, 
diff --git a/avahi.spec b/avahi.spec
index 92a12e6..d09f96b 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -36,7 +36,8 @@ BuildRequires:  mono-devel >= 1.1.13
 Obsoletes:            howl
 Source0:        http://avahi.org/download/%{name}-%{version}.tar.gz
 # enable mono's mcs to work in beehive buildroot:
-Patch6:     avahi-0.6.3-MONO_SHARED_DIR.patch
+Patch1:     avahi-0.6.21-avahi-browse-help-fix.patch
+Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -206,8 +207,9 @@ fashion with mDNS.
 
 %prep
 %setup -q
+%patch1 -p0 -b .avahi-browse-help-fix
 %if %{WITH_MONO}
-%patch6 -p1 -b .MONO_SHARED_DIR
+%patch2 -p1 -b .MONO_SHARED_DIR
 %endif
 
 %build
@@ -462,6 +464,9 @@ fi
 %endif
 
 %changelog
+* Sun Aug 12 2007 Lennart Poettering <lpoetter@redhat.com> - 0.6.21-2
+- Fix avahi-browse --help output
+
 * Sun Aug 12 2007 Lennart Poettering <lpoetter@redhat.com> - 0.6.21-1
 - New upstream release