From 81eb482327e0d5e9bc24e43e41f1246f39fc9b7d52391356037e0427e042aa5b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 21 Jan 2007 10:54:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/avahi?expand=0&rev=2

---
 avahi-0.6.11-security.patch                      |  7 +++----
 ...-dbus-request-name-flags-fix-thoenig-02.patch |  5 ++---
 avahi-gacdir.patch                               | 14 ++++++++++++--
 avahi.changes                                    |  6 ++++++
 avahi.spec                                       | 16 ++++++++++++----
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/avahi-0.6.11-security.patch b/avahi-0.6.11-security.patch
index 252d842..458bc9b 100644
--- a/avahi-0.6.11-security.patch
+++ b/avahi-0.6.11-security.patch
@@ -1,6 +1,6 @@
---- avahi-0.6.11.orig/avahi-core/netlink.c	2006-10-09 11:52:13.000000000 -0400
-+++ avahi-0.6.11/avahi-core/netlink.c	2006-10-09 11:56:30.000000000 -0400
-@@ -61,9 +61,12 @@ int avahi_netlink_work(AvahiNetlink *nl,
+--- avahi-0.6.14/avahi-core/netlink.c
++++ avahi-0.6.14/avahi-core/netlink.c
+@@ -61,7 +61,10 @@
      }
  
      p = (struct nlmsghdr *) nl->buffer;
@@ -12,4 +12,3 @@
      assert(nl->callback);
      
      for (; bytes > 0; p = NLMSG_NEXT(p, bytes)) {
-
diff --git a/avahi-dbus-request-name-flags-fix-thoenig-02.patch b/avahi-dbus-request-name-flags-fix-thoenig-02.patch
index ebf113d..7488cf5 100644
--- a/avahi-dbus-request-name-flags-fix-thoenig-02.patch
+++ b/avahi-dbus-request-name-flags-fix-thoenig-02.patch
@@ -1,6 +1,5 @@
-diff -urN avahi-daemon/dbus-protocol.c avahi-daemon/dbus-protocol.c
---- avahi-daemon/dbus-protocol.c	2006-08-31 20:31:46.000000000 +0200
-+++ avahi-daemon/dbus-protocol.c	2006-11-12 15:49:15.000000000 +0100
+--- avahi-daemon/dbus-protocol.c
++++ avahi-daemon/dbus-protocol.c
 @@ -1067,10 +1067,10 @@
      if (dbus_bus_request_name(
              server->bus,
diff --git a/avahi-gacdir.patch b/avahi-gacdir.patch
index 9095292..5e5a399 100644
--- a/avahi-gacdir.patch
+++ b/avahi-gacdir.patch
@@ -1,6 +1,16 @@
+--- avahi-sharp.pc.in
++++ avahi-sharp.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@prefix@
+-libdir=@libdir@
++libdir=@prefix@/lib
+ 
+ Name: avahi-sharp
+ Description: Mono bindings for the Avahi mDNS/DNS-SD stack
 --- avahi-sharp/Makefile.am
 +++ avahi-sharp/Makefile.am
-@@ -72,10 +72,10 @@
+@@ -75,10 +75,10 @@
  endif
  
  install-data-hook: $(ASSEMBLY)
@@ -15,7 +25,7 @@
  endif
 --- avahi-sharp/Makefile.in
 +++ avahi-sharp/Makefile.in
-@@ -582,10 +582,10 @@
+@@ -599,10 +599,10 @@
  @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
  
  @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
diff --git a/avahi.changes b/avahi.changes
index 4a45e48..1dc458b 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 20 18:40:18 CET 2007 - aj@suse.de
+
+- Fix avahi-sharp.pc file to use correct gcac location.
+- Add obsoletes and provides for mDNSResponder.
+
 -------------------------------------------------------------------
 Thu Dec 14 10:53:09 CET 2006 - sbrabec@suse.cz
 
diff --git a/avahi.spec b/avahi.spec
index 9e65e74..b94a979 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package avahi (Version 0.6.14)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -18,7 +18,7 @@ BuildRequires:  libqt4-devel python-gtk-devel
 BuildRequires:  python-gtk qt-devel
 %endif
 Version:        0.6.14
-Release:        36
+Release:        47
 URL:            http://www.avahi.org/
 Group:          System/Daemons
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
@@ -30,6 +30,8 @@ Patch2:         avahi-dbus-request-name-flags-fix-thoenig-02.patch
 Requires:       dbus-1 python python-gdbm python-gtk
 Autoreqprov:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       mDNSResponder
+Obsoletes:      mDNSResponder <= 107.5
 %package glib
 Summary:        D-BUS Service for Zeroconf/Bonjour
 Requires:       %{name} = %{version}
@@ -60,13 +62,15 @@ Provides:       libdns_sd.so()(64bit)
 Provides:       libdns_sd.so
 %endif
 Group:          System/Daemons
-Conflicts:      mDNSResponder-lib
+Provides:       mDNSResponder-lib
+Obsoletes:      mDNSResponder-lib <= 107.5
 %package compat-mDNSResponder-devel
 Summary:        D-BUS Service for Zeroconf/Bonjour
 Requires:       %{name} = %{version} %{name}-compat-mDNSResponder = %{version}
 Autoreqprov:    on
 Group:          System/Daemons
-Conflicts:      mDNSResponder-devel
+Provides:       mDNSResponder-devel
+Obsoletes:      mDNSResponder-devel <= 107.5
 %package compat-howl
 Summary:        D-BUS Service for Zeroconf/Bonjour
 Requires:       %{name} = %{version}
@@ -345,6 +349,7 @@ autoconf
 	--sysconfdir=/etc\
         --localstatedir="%{_localstatedir}"\
 	--libdir=/usr/%{_lib}\
+	--libexecdir=/usr/lib \
         --mandir=%{_mandir}\
         --enable-qt3\
         --enable-qt4\
@@ -498,6 +503,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/avahi-qt4.pc
 
 %changelog -n avahi
+* Sat Jan 20 2007 - aj@suse.de
+- Fix avahi-sharp.pc file to use correct gcac location.
+- Add obsoletes and provides for mDNSResponder.
 * Thu Dec 14 2006 - sbrabec@suse.cz
 - Created init script symlinks in /usr/sbin (#228203).
 * Sun Nov 12 2006 - thoenig@suse.de