[libphidget/f14/master] Update to version 2.1.8.20110310

[rmattes]

commit df1880ea8a3cfcec2111bf4500ae17c89465d34c
Author: Rich Mattes <richmattes at gmail.com>
Date:   Tue Mar 15 01:06:38 2011 -0400

    Update to version 2.1.8.20110310

 .gitignore                     |    1 +
 libphidget-2.1.8.javadir.patch |   12 ++++++++++++
 libphidget.spec                |   14 +++++++++++++-
 sources                        |    2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a17008..f2ecf57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /libphidget-2.1.7-20100621.disableruntimelinking.patch
 /libphidget_2.1.7.20101103.tar.gz
 /libphidget_2.1.7.20101222.tar.gz
+/libphidget_2.1.8.20110310.tar.gz
diff --git a/libphidget-2.1.8.javadir.patch b/libphidget-2.1.8.javadir.patch
new file mode 100644
index 0000000..ee14f4d
--- /dev/null
+++ b/libphidget-2.1.8.javadir.patch
@@ -0,0 +1,12 @@
+diff -up ./Makefile.am.javadir ./Makefile.am
+--- ./Makefile.am.javadir	2011-03-14 23:38:27.509326003 -0400
++++ ./Makefile.am	2011-03-15 00:00:11.811325975 -0400
+@@ -334,7 +334,7 @@ install-exec-hook:
+ endif
+ 
+ install-data-hook:
+-	if [ -e phidget21.jar ]; then install --owner=root --mode=755 -d $(DESTDIR)/usr/share/java; install --owner=root --mode=644 phidget21.jar $(DESTDIR)/usr/share/java; fi
++	if [ -e phidget21.jar ]; then install --mode=755 -d $(DESTDIR)/usr/share/java; install --mode=644 phidget21.jar $(DESTDIR)/usr/share/java; fi
+ 
+ phidget21.h:
+ 	@echo "Making $@"
diff --git a/libphidget.spec b/libphidget.spec
index 741c366..e4727f9 100644
--- a/libphidget.spec
+++ b/libphidget.spec
@@ -1,5 +1,5 @@
 Name:           libphidget
-Version:        2.1.7.20101222
+Version:        2.1.8.20110310
 Release:        1%{?dist}
 Summary:        Drivers and API for Phidget devices
 
@@ -9,6 +9,12 @@ URL:            http://www.phidgets.com
 Source0:        http://www.phidgets.com/downloads/libraries/libphidget_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         libphidget-2.1.8.javadir.patch
+
+# These are needed
+BuildRequires:  autoconf
+BuildRequires:  libtool
+
 BuildRequires:  avahi-devel
 BuildRequires:  avahi-compat-libdns_sd-devel
 BuildRequires:  java-devel >= 1:1.6.0
@@ -46,12 +52,15 @@ 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
+libtoolize
+autoreconf
 %configure --disable-static --enable-zeroconf=avahi --disable-ldconfig --enable-jni
 make %{?_smp_mflags}
 make phidget21.jar
@@ -94,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/phidget21.jar
 
 %changelog
+* Tue Mar 15 2011 Rich Mattes <richmattes at gmail.com> - 2.1.8.20110310-1
+- Update to version 2.1.8.20110310
+
 * Fri Jan 28 2011 Rich Mattes <richmattes at gmial.com> - 2.1.7.20101222-1
 - Update to version 2.1.7.20101222
 
diff --git a/sources b/sources
index 7b952e9..45b173b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fa25248913eefdc42bba8f96a1b9b6c  libphidget_2.1.7.20101222.tar.gz
+a8da2904875800a0ad33e0c3b46a63e5  libphidget_2.1.8.20110310.tar.gz