[libphidget/f12/master] - Re-enable java bindings - Disable zeroconf runtime linking

[rmattes]

commit acd0003cd66f214aaaa2c63ac70f74cd1e7c42fa
Author: Rich Mattes <jpgr87 at gmail.com>
Date:   Fri Oct 1 23:20:09 2010 -0400

    - Re-enable java bindings
    - Disable zeroconf runtime linking

 .gitignore      |    1 +
 libphidget.spec |   20 +++++++++-----------
 sources         |    1 +
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6bdfe01..ec2e61f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libphidget_2.1.7.20100621.tar.gz
+/libphidget-2.1.7-20100621.disableruntimelinking.patch
diff --git a/libphidget.spec b/libphidget.spec
index 4141611..a1156ca 100644
--- a/libphidget.spec
+++ b/libphidget.spec
@@ -1,18 +1,18 @@
 Name:           libphidget
 Version:        2.1.7.20100621
-Release:        4%{?dist}
+Release:        5%{?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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%ifnarch ppc ppc64
+
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
-%endif
 BuildRequires:  libusb-devel
 BuildRequires:  gawk
 
@@ -32,7 +32,6 @@ Requires:       %{name} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%ifnarch ppc ppc64
 %package        java
 Summary:        Java bindings for %{name}
 Group:          Development/Libraries
@@ -43,17 +42,15 @@ Requires:       jpackage-utils
 %description    java
 The %{name}-java package contains java bindings for the 
 libphidget API.
-%endif
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static --enable-zeroconf --enable-zeroconf-lookup --disable-ldconfig --enable-jni
 make %{?_smp_mflags}
-%ifnarch ppc ppc64
 make phidget21.jar
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,10 +62,9 @@ install -p -m 0644 examples/README $RPM_BUILD_ROOT%{_datadir}/libphidget/example
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -p -m 0644 udev/99-phidgets.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/99-phidgets.rules
 
-%ifnarch ppc ppc64
 mkdir -p -m 0755 $RPM_BUILD_ROOT%{_javadir}
 install -p -m 0644 phidget21.jar $RPM_BUILD_ROOT%{_javadir}/phidget21.jar
-%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -90,13 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_datadir}/libphidget
 
-%ifnarch ppc ppc64
 %files java
 %defattr(-,root,root,-)
 %{_javadir}/phidget21.jar
-%endif
 
 %changelog
+* Fri Oct 01 2010 Rich Mattes <richmattes at gmail.com> - 2.1.7-20100621-5
+- Re-enable java bindings
+- Disable zeroconf runtime linking
+
 * Sun Sep 26 2010 Rich Mattes <richmattes at gmail.com> - 2.1.7.20100621-4
 - Disable java package for ppc/ppc64 due to unavailable jna
 
diff --git a/sources b/sources
index 2dd4df6..e7589ae 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 7b1c559c49922ad69df52c055b426e42  libphidget_2.1.7.20100621.tar.gz
+027ce48bd324d3e9759fee3326f2c8b8  libphidget-2.1.7-20100621.disableruntimelinking.patch