From 5daee29a03e90d64602886019b44d04e24c309f0 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Sep 18 2006 10:40:39 +0000
Subject: added patch from #206445 - ia64: unaligned access errors, removed unused

    patches

---

diff --git a/avahi.spec b/avahi.spec
index 5603d60..14737ba 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.11
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -36,27 +36,17 @@ BuildRequires:  mono-devel >= 1.1.13
 %endif
 Obsoletes:	howl
 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
-Patch4:         avahi-0.6-dbus-0.6.patch
-Patch5:         avahi-0.6.3-bz177148.patch
 # enable mono's mcs to work in beehive buildroot:
 Patch6:         avahi-0.6.3-MONO_SHARED_DIR.patch
-Patch7: 	avahi-0.6.4-initscript-i18n.patch
-Patch8:		avahi-0.6.3-lockfile.patch
-Patch9: 	avahi-0.6.4-localtime.patch
-Patch10:	avahi-0.6.4-bz178784.patch
-Patch11:        avahi-0.6.5-bz179448.patch
 Patch12:	avahi-0.6.7-initscript.patch
 Patch13: 	avahi-0.6.9-bz185972.patch
 Patch14:	avahi-0.6.9-bz189427.patch
 Patch15:	avahi-0.6.9-mono-libdir.patch
-Patch16:	avahi-sharp-lock.patch
 Patch17:	avahi-0.6.11-use-ipv6-yes.patch
 Patch18: 	avahi-0.6.11-dbus-deprecated.patch
 Patch19: 	avahi-0.6.11-param.patch
 Patch20: 	avahi-0.6.11-initscript_desc.patch
+Patch21: 	avahi-0.6.11-align.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -174,39 +164,18 @@ Header files for development with the Apple Bonjour mDNSResponder compatibility 
 
 %prep
 %setup -q
-#%patch1 -p1 -b .fedora
-#^- this patch now upstream
-#%patch2 -p1 -b .start_after_dbus
-#^- this patch now upstream
-#%patch3 -p1 -b .initscript_status
-#^- this patch now upstream
-#%patch4 -p1 -b .dbus-0.6
-#^- this patch now upstream
-#%patch5 -p1 -b .bz177148
-#^- this patch now upstream
 %if %{WITH_MONO}
 %patch6 -p1 -b .MONO_SHARED_DIR
 %endif
-#%patch7 -p1 -b .i18n
-#^- this patch now upstream
-#%patch8 -p1 -b .lockfile
-#^- this patch now upstream
-#%patch9 -p1 -b .localtime
-#^- this patch now upstream
-#%patch10 -p1 -b .bz178746
-#^- this patch now upstream
-#%patch11 -p1 -b .bz179448
-#^- this patch now upstream
 %patch12 -p1 -b .initscript
 %patch13 -p1 -b .bz185972
 %patch14 -p1 -b .bz189427
 %patch15 -p1 -b .mono-libdir
-#%patch16 -p1 -b .sharp-lock
-#^- this patch now upstream
 %patch17 -p1 -b .use-ipv6-yes
 %patch18 -p1 -b .dbus-deprecated
 %patch19 -p1 -b .param
 %patch20 -p1 -b .desc
+%patch21 -p1 -b .align
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -418,6 +387,11 @@ fi
 %endif
 
 %changelog
+* Mon Sep 18 2006 Martin Stransky <stransky@redhat.com> - 0.6.11-6
+- added patch from #206445 - ia64: unaligned access errors seen 
+  during startup of avahi-daemon
+- removed unused patches
+
 * Thu Sep 7 2006 Dan Walsh <dwalsh@redhat.com> - 0.6.11-5
 - Maintain the security context on the localtime file