[libphidget] Update to release 2.1.8-20140319
rmattes
rmattes at fedoraproject.org
Sun Jun 1 18:26:41 UTC 2014
commit da68f23eaa7d33b8735fce6093dedb793fdae838
Author: Rich Mattes <richmattes at gmail.com>
Date: Sun Jun 1 14:26:36 2014 -0400
Update to release 2.1.8-20140319
- Rename phidget21.jar to phidget.jar, install to jnidir (rhbz#1022135)
.gitignore | 1 +
libphidget-2.1.8.javadir.patch | 28 +++++++++++++++++++++++-----
libphidget.spec | 25 +++++++++++--------------
sources | 2 +-
4 files changed, 36 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 883732a..5de7fdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/libphidget_2.1.8.20120716.tar.gz
/libphidget_2.1.8.20120912.tar.gz
/libphidget_2.1.8.20121218.tar.gz
+/libphidget_2.1.8.20140319.tar.gz
diff --git a/libphidget-2.1.8.javadir.patch b/libphidget-2.1.8.javadir.patch
index ee14f4d..70f771d 100644
--- a/libphidget-2.1.8.javadir.patch
+++ b/libphidget-2.1.8.javadir.patch
@@ -1,12 +1,30 @@
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:
+--- ./Makefile.am.javadir 2014-06-01 14:07:20.219157831 -0400
++++ ./Makefile.am 2014-06-01 14:10:00.327340615 -0400
+@@ -106,7 +106,7 @@ libphidget21_la_SOURCES = cphidget.c \
+
+ include_HEADERS = phidget21.h
+
+-CLEANFILES = phidget21.h phidget21matlab.h phidget21.jar Java/com/phidgets/*.class Java/com/phidgets/event/*.class
++CLEANFILES = phidget21.h phidget21matlab.h phidget.jar Java/com/phidgets/*.class Java/com/phidgets/event/*.class
+
+ distclean-local:
+ -rm -rf examples/.deps examples/Makefile
+@@ -351,7 +351,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
+- if [ -e phidget21.jar ]; then install --owner=root --mode=755 -d $(DESTDIR)/usr/java/packages/lib/ext; install --owner=root --mode=755 -d $(DESTDIR)/usr/share/java; install --owner=root --mode=644 phidget21.jar $(DESTDIR)/usr/share/java; install --owner=root --mode=644 phidget21.jar $(DESTDIR)/usr/java/packages/lib/ext; fi
++ if [ -e phidget.jar ]; then install --mode=755 -d $(DESTDIR)/usr/lib/java; install -p --mode=644 phidget.jar $(DESTDIR)/usr/lib/java; fi
+ if DEBUG
phidget21.h:
+@@ -378,7 +378,7 @@ phidget21matlab_unix.h:
+ @cat cphidgetconstants.h >> $@
+ @cat matlabFooter >> $@
+
+-phidget21.jar:
++phidget.jar:
@echo "Making $@"
+ @cd Java ; javac com/phidgets/*.java com/phidgets/event/*.java
+ @cd Java ; jar cf ../$@ com/phidgets/event/*.class com/phidgets/*.class
diff --git a/libphidget.spec b/libphidget.spec
index 6db1719..a07752f 100644
--- a/libphidget.spec
+++ b/libphidget.spec
@@ -1,13 +1,12 @@
Name: libphidget
-Version: 2.1.8.20121218
-Release: 4%{?dist}
+Version: 2.1.8.20140319
+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_%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: libphidget-2.1.8.javadir.patch
@@ -33,7 +32,7 @@ of by the robust libphidget API.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
@@ -52,7 +51,7 @@ libphidget API.
%prep
%setup -q
-%patch0 -p0
+%patch0 -p0 -b .javadir
# These headers are supplied by the avahi-compat-libdns_sd-devel package
# We can get rid of the bundled ones
rm -rf linux/avahi-*
@@ -62,7 +61,7 @@ rm -rf include/dns_sd.h
autoreconf -i
%configure --disable-silent-rules --disable-static --enable-zeroconf=avahi --disable-ldconfig --enable-jni
make %{?_smp_mflags}
-make phidget21.jar
+make phidget.jar
%install
rm -rf $RPM_BUILD_ROOT
@@ -73,8 +72,6 @@ install -p -m 0644 examples/*c $RPM_BUILD_ROOT%{_datadir}/libphidget/examples
install -p -m 0644 examples/README $RPM_BUILD_ROOT%{_datadir}/libphidget/examples
mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/udev/rules.d
install -p -m 0644 udev/99-phidgets.rules $RPM_BUILD_ROOT/lib/udev/rules.d/99-phidgets.rules
-mkdir -p -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 0644 phidget21.jar $RPM_BUILD_ROOT%{_javadir}/phidget21.jar
%clean
rm -rf $RPM_BUILD_ROOT
@@ -85,24 +82,24 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc COPYING AUTHORS README
%{_libdir}/*.so.*
-%config(noreplace) /lib/udev/rules.d/*
+/lib/udev/rules.d/*
%files devel
-%defattr(-,root,root,-)
-%doc
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/libphidget
%files java
-%defattr(-,root,root,-)
-%{_javadir}/phidget21.jar
+%{_jnidir}/phidget.jar
%changelog
+* Sun Jun 01 2014 Rich Mattes <rmattes at fedoraproject.org> - 2.1.8.20140319-1
+- Update to release 2.1.8-20140319
+- Rename phidget21.jar to phidget.jar, install to jnidir (rhbz#1022135)
+
* Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 2.1.8.20121218-4
- Use Requires: java-headless rebuild (#1067528)
diff --git a/sources b/sources
index 705b6e5..ad374f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6791557be672148d34712a75126f27e2 libphidget_2.1.8.20121218.tar.gz
+2eb81f1fc132a5a3532ceab831a2a449 libphidget_2.1.8.20140319.tar.gz
More information about the scm-commits
mailing list