[rxtx] fix fhs_lock #666761

[Levente Farkas]

commit 20e5d7ffa739f3c9f77e4eed108f7062616a5165
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Thu Mar 17 21:51:53 2011 +0100

    fix fhs_lock #666761

 rxtx-2.2-fhs_lock.patch |   13 +++++++++++++
 rxtx.spec               |   13 +++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/rxtx-2.2-fhs_lock.patch b/rxtx-2.2-fhs_lock.patch
new file mode 100644
index 0000000..5ec0685
--- /dev/null
+++ b/rxtx-2.2-fhs_lock.patch
@@ -0,0 +1,13 @@
+--- ./src/SerialImp.c.orig	2011-03-17 14:42:48.946047373 -0500
++++ ./src/SerialImp.c		2011-03-17 14:46:01.244904859 -0500
+@@ -5291,8 +5291,8 @@ 
+ 	 *
+ 	 */
+ 	int fd,j;
+-	char lockinfo[12], message[80];
+-	char file[80], *p;
++	char lockinfo[12], message[200];
++	char file[200], *p;
+ 
+ 	j = strlen( filename );
+ 	p = ( char * ) filename + j;
diff --git a/rxtx.spec b/rxtx.spec
index 7ae571e..3105e31 100644
--- a/rxtx.spec
+++ b/rxtx.spec
@@ -4,7 +4,7 @@
 
 %global upver	2.2
 %global uprel	20100211
-%global rel	0.3
+%global rel	0.4
 
 #global jni	%{_jnidir}
 %global jni	%{_libdir}/%{name}
@@ -12,7 +12,7 @@
 Summary:	Parallel communication for the Java Development Toolkit
 Name:		rxtx
 Version:	%{upver}
-Release:	%{rel}.%{uprel}%{?dist}.1
+Release:	%{rel}.%{uprel}%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://rxtx.qbang.org/
@@ -24,7 +24,8 @@ Source:		%{name}-%{uprel}.tar.bz2
 #Source:		http://rxtx.qbang.org/pub/rxtx/%{name}-%{upver}-%{uprel}.tgz
 Patch1:		rxtx-2.2-loadlibrary.patch
 Patch2:		rxtx-2.2-no-io.h.patch
-Patch3:		rxtx-2.2-lock.patch
+Patch3:		rxtx-2.2-fhs_lock.patch
+Patch4:		rxtx-2.2-lock.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	java-devel
@@ -47,8 +48,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
+%if 0%{?fedora} > 13 || 0%{?rhel} > 5
+%patch4 -p1
 %endif
 # remove prebuild binaries
 find . -name '*.jar' -exec rm {} \;
@@ -79,6 +81,9 @@ rm -rf %{buildroot}
 %{jni}
 
 %changelog
+* Thu Mar 17 2011 Levente Farkas <lfarkas at lfarkas.org> - 2.2-0.4.20100211
+- fix fhs_lock  #666761
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.3.20100211.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild