[libphidget/f13/master] - Update to latest version - Remove dependencies on bundled avahi headers - Add explicit runtime req

[rmattes]

commit 0f6366de5e1f043685647c70100f7f33d5e0db3a
Author: Rich <richmattes at gmail.com>
Date:   Tue Dec 14 22:18:45 2010 -0500

    - Update to latest version
    - Remove dependencies on bundled avahi headers
    - Add explicit runtime requirement for avahi dns_sd
    - Fix undefined symbols bug (#662661)

 .gitignore      |    1 +
 libphidget.spec |   23 +++++++++++++++++------
 sources         |    3 +--
 3 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec2e61f..7e83d63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libphidget_2.1.7.20100621.tar.gz
 /libphidget-2.1.7-20100621.disableruntimelinking.patch
+/libphidget_2.1.7.20101103.tar.gz
diff --git a/libphidget.spec b/libphidget.spec
index 73005f3..62ee065 100644
--- a/libphidget.spec
+++ b/libphidget.spec
@@ -1,21 +1,23 @@
 Name:           libphidget
-Version:        2.1.7.20100621
-Release:        5%{?dist}
+Version:        2.1.7.20101103
+Release:        1%{?dist}
 Summary:        Drivers and API for Phidget devices
 
 Group:          Development/Libraries
 License:        LGPLv3
 URL:            http://www.phidgets.com
-Source0:        http://www.phidgets.com/downloads/libraries/libphidget_2.1.7.20100621.tar.gz
-Patch0:         libphidget-2.1.7-20100621.disableruntimelinking.patch
+Source0:        http://www.phidgets.com/downloads/libraries/libphidget_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  avahi-devel
+BuildRequires:  avahi-compat-libdns_sd-devel
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
 BuildRequires:  libusb-devel
 BuildRequires:  gawk
 
 Requires:       udev
+Requires:       avahi-compat-libdns_sd
 
 %description
 Phidgets are a set of "plug and play" building blocks for low cost USB 
@@ -44,10 +46,13 @@ libphidget API.
 
 %prep
 %setup -q
-%patch0 -p0
+# These headers are supplied by the avahi-compat-libdns_sd-devel package
+# We can get rid of the bundled ones
+rm -rf linux/avahi-*
+rm -rf include/dns_sd.h
 
 %build
-%configure --disable-static --enable-zeroconf --enable-zeroconf-lookup --disable-ldconfig --enable-jni
+%configure --disable-static --enable-zeroconf=avahi --disable-ldconfig --enable-jni
 make %{?_smp_mflags}
 make phidget21.jar
 
@@ -89,6 +94,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/phidget21.jar
 
 %changelog
+* Tue Dec 14 2010 Rich Mattes <richmattes at gmail.com> - 2.1.7.20101103-1
+- Update to latest version
+- Remove dependencies on bundled avahi headers
+- Add explicit runtime requirement for avahi dns_sd
+- Fix undefined symbols bug (#662661)
+
 * Fri Oct 01 2010 Rich Mattes <richmattes at gmail.com> - 2.1.7.20100621-5
 - Disable zeroconf runtime linking
 
diff --git a/sources b/sources
index e7589ae..b3e34c4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7b1c559c49922ad69df52c055b426e42  libphidget_2.1.7.20100621.tar.gz
-027ce48bd324d3e9759fee3326f2c8b8  libphidget-2.1.7-20100621.disableruntimelinking.patch
+314fd2c2f9ebcb297d3034157bbae24b  libphidget_2.1.7.20101103.tar.gz