merge newer f17 into master, ARM has mono

avahi.spec

@@ -1,7 +1,7 @@
 %{?!WITH_MONO:          %define WITH_MONO 1}
 %{?!WITH_COMPAT_DNSSD:  %define WITH_COMPAT_DNSSD 1}
 %{?!WITH_COMPAT_HOWL:   %define WITH_COMPAT_HOWL  1}
-%ifarch sparc64 s390 %{arm}
+%ifarch sparc64 s390
 %define WITH_MONO 0
 %endif
 %if 0%{?rhel}
@@ -10,11 +10,15 @@
 
 Name:           avahi
 Version:        0.6.31
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Local network service discovery
 Group:          System Environment/Base
 License:        LGPLv2
 URL:            http://avahi.org
+
+Source0:        http://avahi.org/download/%{name}-%{version}.tar.gz
+Patch0:         avahi-0.6.30-mono-libdir.patch
+
 Requires:       dbus
 Requires:       expat
 Requires:       libdaemon >= 0.11
@@ -48,9 +52,6 @@ BuildRequires:  perl-XML-Parser
 BuildRequires:  mono-devel >= 1.1.13
 BuildRequires:  monodoc-devel
 %endif
-Obsoletes:      howl
-Source0:        http://avahi.org/download/%{name}-%{version}.tar.gz
-Patch0:         avahi-0.6.30-mono-libdir.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -656,6 +657,10 @@ fi
 %endif
 
 %changelog
+* Mon May 21 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 0.6.31-3
+- Merge F-17 into master
+- ARM has mono
+
 * Tue Feb 14 2012 Lennart Poettering <lpoetter@redhat.com> - 0.6.31-2
 - Fix tarball