diff --git a/rxtx.spec b/rxtx.spec index 34f9688..3346887 100644 --- a/rxtx.spec +++ b/rxtx.spec @@ -4,7 +4,7 @@ %global upver 2.2 %global uprel 20100211 -%global rel 0.1 +%global rel 0.2 #global jni %{_jnidir} %global jni %{_libdir}/%{name} @@ -23,6 +23,7 @@ URL: http://rxtx.qbang.org/ Source: %{name}-%{uprel}.tar.bz2 #Source: http://rxtx.qbang.org/pub/rxtx/%{name}-%{upver}-%{uprel}.tgz Patch1: %{name}-%{version}-loadlibrary.patch +Patch2: rxtx-2.2-no-io.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-devel @@ -44,6 +45,7 @@ IEEE 1284, RS485, I2C and RawIO. #setup -q -n rxtx-%{upver}-%{uprel} %setup -q -n rxtx-%{uprel} sed -e 's|@JNIPATH@|%{jni}|' %{PATCH1} | patch -s -b --suffix .p1 -p1 +%patch2 -p1 # remove prebuild binaries find . -name '*.jar' -exec rm {} \; find . -name '*.hqx' -exec rm {} \; @@ -73,6 +75,9 @@ rm -rf %{buildroot} %{jni} %changelog +* Tue Mar 30 2010 Dennis Gilmore - 2.2-0.2.20100211 +- apply patch from Patrick Ale excluding the inclusion of sys/io.h on sparc + * Thu Feb 11 2010 Levente Farkas - 2.2-0.1.20100211 - update to the latest cvs to fix #555219