[rxtx] add missing patch and fix #650849

[Levente Farkas]

commit 25431e85a87720d379a1e8ade5b0eef067ccbe8b
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Tue Nov 9 16:23:59 2010 +0100

    add missing patch and fix #650849

 rxtx-2.2-lock.patch    |   12 ++++++++++++
 rxtx-2.2-no-io.h.patch |   12 ++++++++++++
 rxtx.spec              |   11 +++++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/rxtx-2.2-lock.patch b/rxtx-2.2-lock.patch
new file mode 100644
index 0000000..c418fc4
--- /dev/null
+++ b/rxtx-2.2-lock.patch
@@ -0,0 +1,12 @@
+diff -up ./src/SerialImp.h.lock ./src/SerialImp.h
+--- ./src/SerialImp.h.lock	2010-11-09 15:59:54.891179571 +0100
++++ ./src/SerialImp.h	2010-11-09 16:01:12.257819409 +0100
+@@ -158,7 +158,7 @@ struct event_info_struct
+ #	endif /* CMSPAR */
+ #	
+ #	define DEVICEDIR "/dev/"
+-#	define LOCKDIR "/var/lock"
++#	define LOCKDIR "/var/lock/lockdev"
+ #	define LOCKFILEPREFIX "LCK.."
+ #	define FHS
+ #endif /* __linux__ */
diff --git a/rxtx-2.2-no-io.h.patch b/rxtx-2.2-no-io.h.patch
new file mode 100644
index 0000000..5f8cc1f
--- /dev/null
+++ b/rxtx-2.2-no-io.h.patch
@@ -0,0 +1,12 @@
+--- rxtx-20100211/src/RawImp.c.orig	2010-03-30 12:02:43.520015293 +0200
++++ rxtx-20100211/src/RawImp.c	2010-03-30 12:03:19.760013324 +0200
+@@ -101,7 +101,9 @@
+ #endif
+ #ifndef __APPLE__  /* dima */
+ #ifndef PPC
++#ifndef sparc
+ #include <sys/io.h>
++#endif /* sparc */
+ #endif /* PPC */
+ #endif /* dima */
+ 
diff --git a/rxtx.spec b/rxtx.spec
index 3346887..e39972e 100644
--- a/rxtx.spec
+++ b/rxtx.spec
@@ -4,7 +4,7 @@
 
 %global upver	2.2
 %global uprel	20100211
-%global rel	0.2
+%global rel	0.3
 
 #global jni	%{_jnidir}
 %global jni	%{_libdir}/%{name}
@@ -22,8 +22,9 @@ URL:		http://rxtx.qbang.org/
 #  tar cjvf rxtx-%{uprel}.tar.bz2 --exclude CVS --exclude .cvsignore rxtx-%{uprel}
 Source:		%{name}-%{uprel}.tar.bz2
 #Source:		http://rxtx.qbang.org/pub/rxtx/%{name}-%{upver}-%{uprel}.tgz
-Patch1:		%{name}-%{version}-loadlibrary.patch
+Patch1:		rxtx-2.2-loadlibrary.patch
 Patch2:         rxtx-2.2-no-io.h.patch
+Patch3:		rxtx-2.2-lock.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	java-devel
@@ -46,6 +47,9 @@ IEEE 1284, RS485, I2C and RawIO.
 %setup -q -n rxtx-%{uprel}
 sed -e 's|@JNIPATH@|%{jni}|' %{PATCH1} | patch -s -b --suffix .p1 -p1
 %patch2 -p1
+%if 0%{?fedora} > 13
+%patch3 -p1
+%endif
 # remove prebuild binaries
 find . -name '*.jar' -exec rm {} \;
 find . -name '*.hqx' -exec rm {} \;
@@ -75,6 +79,9 @@ rm -rf %{buildroot}
 %{jni}
 
 %changelog
+* Tue Nov  9 2010 Levente Farkas <lfarkas at lfarkas.org> - 2.2-0.3.20100211
+- fix lock dir location #650849
+
 * Tue Mar 30 2010 Dennis Gilmore <dennis at ausil.us> - 2.2-0.2.20100211
 - apply patch from Patrick Ale excluding the inclusion of sys/io.h on sparc