rpms/avahi/FC-5 avahi-0.6.9-mono-libdir.patch, NONE, 1.1 avahi-sharp-lock.patch, NONE, 1.1 avahi.spec, 1.47, 1.48

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/avahi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20909

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.9-mono-libdir.patch avahi-sharp-lock.patch 
Log Message:
fix avahi-sharp / banshee issues; fix bug 189427: avahi-resolve --help output

avahi-0.6.9-mono-libdir.patch:
 avahi-sharp.pc.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE avahi-0.6.9-mono-libdir.patch ---
--- avahi-0.6.9/avahi-sharp.pc.in.mono-libdir	2006-05-02 16:38:13.000000000 -0400
+++ avahi-0.6.9/avahi-sharp.pc.in	2006-05-02 16:38:42.000000000 -0400
@@ -5,4 +5,4 @@
 Name: avahi-sharp
 Description: Mono bindings for the Avahi mDNS/DNS-SD stack
 Version: @PACKAGE_VERSION@
-Libs: -r:${libdir}/mono/avahi-sharp/avahi-sharp.dll
+Libs: -r:${prefix}/lib/mono/avahi-sharp/avahi-sharp.dll

avahi-sharp-lock.patch:
 EntryGroup.cs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE avahi-sharp-lock.patch ---
http://www.avahi.org/changeset/1188
Fixes a sporadic crash in banshee


Index: trunk/avahi-sharp/EntryGroup.cs
===================================================================
--- trunk/avahi-sharp/EntryGroup.cs (revision 1021)
+++ trunk/avahi-sharp/EntryGroup.cs (revision 1188)
@@ -237,9 +237,13 @@
                                  string domain, string host, UInt16 port, IntPtr list)
         {
-            int ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
+            int ret;
+
+            lock (client) {
+                ret = avahi_entry_group_add_service_strlst (handle, iface, proto, flags,
                                                             Utility.StringToBytes (name),
                                                             Utility.StringToBytes (type),
                                                             Utility.StringToBytes (domain),
                                                             Utility.StringToBytes (host), port, list);
+            }
             
             avahi_string_list_free (list);


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- avahi.spec	20 Mar 2006 22:54:26 -0000	1.47
+++ avahi.spec	2 May 2006 23:06:46 -0000	1.48
@@ -4,7 +4,7 @@
 %endif
 Name:           avahi
 Version:        0.6.9
-Release: 	8.FC5
+Release: 	9.FC5
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -32,6 +32,9 @@
 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
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -141,6 +144,9 @@
 #^- 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
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -250,7 +256,7 @@
 %ghost %{_sysconfdir}/avahi/etc/localtime
 %{_sysconfdir}/avahi/hosts
 %dir %{_sysconfdir}/avahi/services
-%dir %{_localstatedir}/run/avahi-daemon
+%attr(0750,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
 %config %{_sysconfdir}/avahi/avahi-dnsconfd.action
 %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
@@ -321,6 +327,12 @@
 %endif
 
 %changelog
+* Tue May 02 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
+- fix avahi-sharp issues for banshee - patches from caillon at redhat.com
+
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
+- fix bug 189427: correct avahi-resolve --help typo
+
 * Mon Mar 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-8.FC6
 - fix bug 185972: remove ellipses in initscript
 - fix bug 185965: make chkconfigs unconditional