From 2d2a8626325611ec75269b76b4444f892cad80d5 Mon Sep 17 00:00:00 2001 From: jvdias Date: Jan 16 2006 23:56:58 +0000 Subject: fix bugs 177610, 177609; upgrade to avahi-0.6.4 --- diff --git a/.cvsignore b/.cvsignore index 46e09e1..6ad74ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ avahi-0.5.2.tar.gz avahi-0.6.tar.gz avahi-0.6.1.tar.gz avahi-0.6.3.tar.gz +avahi-0.6.4.tar.gz diff --git a/avahi.spec b/avahi.spec index 769a470..7987367 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,12 +1,19 @@ +%{?!WITH_MONO: %define WITH_MONO 1} +%ifarch ppc64 +%define WITH_MONO 0 +%endif Name: avahi -Version: 0.6.3 -Release: 2 +Version: 0.6.4 +Release: 1 Summary: Local network service discovery Group: System Environment/Base License: LGPL URL: http://avahi.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel, mono-devel >= 1.1.13 +BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel +%if %{WITH_MONO} +BuildRequires: mono-devel >= 1.1.13 +%endif Requires: dbus, libdaemon, expat, python, dbus-python, libcap Obsoletes: howl, howl-libs Source0: %{name}-%{version}.tar.gz @@ -75,6 +82,7 @@ Requires: qt-devel The avahi-qt3-devel package contains the header files and libraries necessary for developing programs using avahi with Qt3. +%if %{WITH_MONO} %package sharp Summary: Mono language bindings for avahi mono development Group: Development/Libraries @@ -84,6 +92,7 @@ Requires: mono-core >= 1.1.13 %description sharp The avahi-sharp package contains the files needed to develop mono programs that use avahi. +%endif %package devel Summary: Libraries and header files for avahi development @@ -106,7 +115,9 @@ necessary for developing programs using avahi. #%patch4 -p1 -b .dbus-0.6 #^- this patch now upstream %patch5 -p1 -b .bz177148 +%if %{WITH_MONO} %patch6 -p1 -b .MONO_SHARED_DIR +%endif %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -115,7 +126,11 @@ libtoolize --force automake-1.9 --add-missing autoconf -%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd +%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd \ +%if ! %{WITH_MONO} + --disable-mono \ +%endif +; make %{?_smp_mflags} %install @@ -259,13 +274,18 @@ fi %attr(755,root,root) %{_libdir}/libavahi-qt3.so %{_includedir}/avahi-qt3 +%if %{WITH_MONO} %files sharp %defattr(0644, root, root, 0755) /usr/lib/mono/avahi-sharp /usr/lib/mono/gac/avahi-sharp /usr/lib/pkgconfig/avahi-sharp.pc +%endif %changelog +* Mon Jan 16 2006 Jason Vas Dias - 0.6.4-1 +- Upgrade to upstream version 0.6.4 + * Thu Jan 12 2006 Jason Vas Dias - 0.6.3-2 - fix bug 177610: Enable mono support with new avahi-sharp package - fix bug 177609: add gdbm / gdbm-devel Requires for avahi-browse diff --git a/sources b/sources index bd3e3d0..7497259 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0203f7fdd8d16914594f5c7ab2ec8e71 avahi-0.6.3.tar.gz +12eb941043f26f82c51e99821ac52c44 avahi-0.6.4.tar.gz