[libphidget/f15/master] Added autotools calls to the specfile
rmattes
rmattes at fedoraproject.org
Tue Mar 15 04:35:56 UTC 2011
commit 210e0230824a405f3e8851ad0e6d91abea58cc2b
Author: Rich Mattes <richmattes at gmail.com>
Date: Tue Mar 15 00:09:08 2011 -0400
Added autotools calls to the specfile
libphidget-2.1.8.javadir.patch | 12 ++++++++++++
libphidget.spec | 8 ++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
---
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 62e4aff..882deb7 100644
--- a/libphidget.spec
+++ b/libphidget.spec
@@ -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
+
+# Needed because Makefile.am is patched
+BuildRequires: libtool
+BuildRequires: autoconf
+
BuildRequires: avahi-devel
BuildRequires: avahi-compat-libdns_sd-devel
BuildRequires: java-devel >= 1:1.6.0
@@ -52,6 +58,8 @@ 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
More information about the scm-commits
mailing list