diff --git a/.cvsignore b/.cvsignore index 2e55bff..3c849ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rxtx-2.1-7r2.tgz +rxtx-20100211.tar.bz2 diff --git a/import.log b/import.log index 4439f53..fd53316 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ rxtx-2_1-0_2_7r2_fc9:HEAD:rxtx-2.1-0.2.7r2.fc9.src.rpm:1224531706 +rxtx-2_2-0_1_20100211_fc12:F-12:rxtx-2.2-0.1.20100211.fc12.src.rpm:1265908730 diff --git a/rxtx-2.1-configure.patch b/rxtx-2.1-configure.patch deleted file mode 100644 index 8c43124..0000000 --- a/rxtx-2.1-configure.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up ./configure.in.p2 ./configure.in ---- ./configure.in.p2 2006-01-30 05:37:47.000000000 +0100 -+++ ./configure.in 2008-08-19 16:21:42.000000000 +0200 -@@ -458,12 +458,12 @@ fi - [ case $OS_NAME in - Linux) - LDFLAGS=$LDFLAGS" -lpthread" -- check_kernel_headers -+ #check_kernel_headers - check_java_headers - CFLAGS=$CFLAGS" -D__need_timespec" - case $JAVA_VERSION in - -- 1.2*|1.3*|1.4*|1.5*) -+ 1.2*|1.3*|1.4*|1.5*|1.6*) - #fix_parameters $JPATH/jre/lib/javax.comm.properties - CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` - JHOME=$JPATH"/jre/lib/ext" -@@ -533,7 +533,7 @@ Linux) - TARGETLIB="\$(target_triplet)/librxtxSerial.la \ - \$(target_triplet)/librxtxParallel.la" - case $JAVA_VERSION in -- 1.2*|1.3*|1.4*|1.5*) -+ 1.2*|1.3*|1.4*|1.5*|1.6*) - #fix_parameters $JPATH/jre/lib/javax.comm.properties - CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` - RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" -@@ -669,7 +669,7 @@ BeOS) - - WIN32) - case $JAVA_VERSION in -- 1.2*|1.3*|1.4*|1.5*) -+ 1.2*|1.3*|1.4*|1.5*|1.6*) - CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH" - JHOME=$JPATH"/jre/lib/ext" - ;; -@@ -721,7 +721,7 @@ Solaris*) - CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" - - case $JAVA_VERSION in -- 1.2*|1.3*|1.4*|1.5*) -+ 1.2*|1.3*|1.4*|1.5*|1.6*) - RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" - ;; - 1.1*) diff --git a/rxtx-2.1-loadlibrary.patch b/rxtx-2.1-loadlibrary.patch deleted file mode 100644 index 7513b72..0000000 --- a/rxtx-2.1-loadlibrary.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- ./src/I2C.java.lfarkas 2008-08-01 23:29:24.000000000 +0200 -+++ ./src/I2C.java 2008-08-01 23:29:59.000000000 +0200 -@@ -35,7 +35,7 @@ - - static - { -- System.loadLibrary( "rxtxI2C" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxI2C")); - Initialize(); - } - ---- ./src/RXTXPort.java.lfarkas 2008-08-01 23:30:53.000000000 +0200 -+++ ./src/RXTXPort.java 2008-08-01 23:31:16.000000000 +0200 -@@ -51,7 +51,7 @@ - - if(debug ) - z.reportln( "RXTXPort {}"); -- System.loadLibrary( "rxtxSerial" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial")); - Initialize(); - } - ---- ./src/Raw.java.lfarkas 2008-08-01 23:26:50.000000000 +0200 -+++ ./src/Raw.java 2008-08-01 23:27:54.000000000 +0200 -@@ -32,7 +32,7 @@ - - static - { -- System.loadLibrary( "rxtxRaw" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxRaw")); - Initialize(); - } - ---- ./src/RXTXCommDriver.java.lfarkas 2008-08-01 23:31:28.000000000 +0200 -+++ ./src/RXTXCommDriver.java 2008-08-01 23:31:59.000000000 +0200 -@@ -42,7 +42,7 @@ - static - { - if(debug ) System.out.println("RXTXCommDriver {}"); -- System.loadLibrary( "rxtxSerial" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial")); - - /* - Perform a crude check to make sure people don't mix ---- ./src/LPRPort.java.lfarkas 2008-08-01 23:28:08.000000000 +0200 -+++ ./src/LPRPort.java 2008-08-01 23:28:34.000000000 +0200 -@@ -32,7 +32,7 @@ - { - - static { -- System.loadLibrary( "rxtxParallel" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxParallel")); - Initialize(); - } - ---- ./src/RS485.java.lfarkas 2008-08-01 23:25:53.000000000 +0200 -+++ ./src/RS485.java 2008-08-01 23:26:31.000000000 +0200 -@@ -32,7 +32,7 @@ - - static - { -- System.loadLibrary( "rxtxRS485" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxRS485")); - Initialize(); - } - ---- ./src/CommPortIdentifier.java.lfarkas 2008-08-01 23:30:13.000000000 +0200 -+++ ./src/CommPortIdentifier.java 2008-08-01 23:30:43.000000000 +0200 -@@ -80,7 +80,7 @@ - if (debug) - System.out.println("Have not implemented native_psmisc_report_owner(PortName)); in CommPortIdentifier"); - } -- System.loadLibrary( "rxtxSerial" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial")); - } - CommPortIdentifier ( String pn, CommPort cp, int pt, CommDriver driver) - { ---- ./src/RXTXVersion.java.lfarkas 2008-08-01 23:28:44.000000000 +0200 -+++ ./src/RXTXVersion.java 2008-08-01 23:29:09.000000000 +0200 -@@ -36,7 +36,7 @@ - private static String Version; - - static { -- System.loadLibrary( "rxtxSerial" ); -+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial")); - Version = "RXTX-2.1-7"; - } - /** diff --git a/rxtx-2.1-uts.patch b/rxtx-2.1-uts.patch deleted file mode 100644 index fdce804..0000000 --- a/rxtx-2.1-uts.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up ./src/I2CImp.c.p3 ./src/I2CImp.c ---- ./src/I2CImp.c.p3 2004-10-17 16:23:02.000000000 +0200 -+++ ./src/I2CImp.c 2008-08-19 16:33:25.000000000 +0200 -@@ -86,7 +86,7 @@ JNIEXPORT void JNICALL Java_gnu_io_I2CPo - sigaction( SIGIO, NULL, &handler ); - if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); - #endif /* !__FreeBSD__ */ --#if defined(__linux__) -+#if defined(DEBUG) && defined(__linux__) - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -98,7 +98,7 @@ JNIEXPORT void JNICALL Java_gnu_io_I2CPo - fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); - getchar(); - } --#endif /* __linux__ */ -+#endif /* DEBUG && __linux__ */ - #endif /* WIN32 */ - } - -diff -up ./src/RawImp.c.p3 ./src/RawImp.c ---- ./src/RawImp.c.p3 2004-10-16 18:20:35.000000000 +0200 -+++ ./src/RawImp.c 2008-08-19 16:33:25.000000000 +0200 -@@ -230,7 +230,7 @@ JNIEXPORT void JNICALL Java_gnu_io_RawPo - sigaction( SIGIO, NULL, &handler ); - if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); - #endif /* !__FreeBSD__ */ --#if defined(__linux__) -+#if defined(DEBUG) && defined(__linux__) - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -242,7 +242,7 @@ JNIEXPORT void JNICALL Java_gnu_io_RawPo - fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); - getchar(); - } --#endif /* __linux__ */ -+#endif /* DEBUG && __linux__ */ - #endif /* WIN32 */ - } - -diff -up ./src/RS485Imp.c.p3 ./src/RS485Imp.c ---- ./src/RS485Imp.c.p3 2008-08-19 16:35:10.000000000 +0200 -+++ ./src/RS485Imp.c 2008-08-19 16:35:49.000000000 +0200 -@@ -86,7 +86,7 @@ JNIEXPORT void JNICALL Java_gnu_io_RS485 - sigaction( SIGIO, NULL, &handler ); - if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); - #endif /* !__FreeBSD__ */ --#if defined(__linux__) -+#if defined(DEBUG) && defined(__linux__) - /* Lets let people who upgraded kernels know they may have problems */ - if (uname (&name) == -1) - { -@@ -98,7 +98,7 @@ JNIEXPORT void JNICALL Java_gnu_io_RS485 - fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release); - getchar(); - } --#endif /* __linux__ */ -+#endif /* DEBUG && __linux__ */ - #endif /* WIN32 */ - } - diff --git a/rxtx-2.2-loadlibrary.patch b/rxtx-2.2-loadlibrary.patch new file mode 100644 index 0000000..5e5d87e --- /dev/null +++ b/rxtx-2.2-loadlibrary.patch @@ -0,0 +1,78 @@ +diff -up ./CNI/CommPortIdentifier.java.load ./CNI/CommPortIdentifier.java +diff -up ./CNI/RXTXCommDriver.java.load ./CNI/RXTXCommDriver.java +diff -up ./CNI/RXTXPort.java.load ./CNI/RXTXPort.java +diff -up ./CNI/Zystem.java.load ./CNI/Zystem.java +diff -up ./INSTALL.load ./INSTALL +diff -up ./contrib/MAcOSX/RXTXInstaller/build/Debug/RXTXInstaller.jar.load ./contrib/MAcOSX/RXTXInstaller/build/Debug/RXTXInstaller.jar +diff -up ./contrib/MAcOSX/RXTXInstaller/jnlp/RXTXInstaller.jar.load ./contrib/MAcOSX/RXTXInstaller/jnlp/RXTXInstaller.jar +diff -up ./src/gnu/io/CommPortIdentifier.java.load ./src/gnu/io/CommPortIdentifier.java +--- ./src/gnu/io/CommPortIdentifier.java.load 2010-02-11 17:30:43.371679285 +0100 ++++ ./src/gnu/io/CommPortIdentifier.java 2010-02-11 17:32:38.026689711 +0100 +@@ -120,7 +120,7 @@ public class CommPortIdentifier extends + if (debug) + System.out.println("Have not implemented native_psmisc_report_owner(PortName)); in CommPortIdentifier"); + } +- System.loadLibrary( "rxtxSerial" ); ++ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxSerial" )); + } + CommPortIdentifier ( String pn, CommPort cp, int pt, CommDriver driver) + { +diff -up ./src/gnu/io/I2C.java.load ./src/gnu/io/I2C.java +--- ./src/gnu/io/I2C.java.load 2010-02-11 17:30:43.373679172 +0100 ++++ ./src/gnu/io/I2C.java 2010-02-11 17:33:12.727679091 +0100 +@@ -74,7 +74,7 @@ final class I2C extends I2CPort { + + static + { +- System.loadLibrary( "rxtxI2C" ); ++ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxI2C" )); + Initialize(); + } + +diff -up ./src/gnu/io/RS485.java.load ./src/gnu/io/RS485.java +--- ./src/gnu/io/RS485.java.load 2010-02-11 17:30:43.372692498 +0100 ++++ ./src/gnu/io/RS485.java 2010-02-11 17:32:56.269471487 +0100 +@@ -71,7 +71,7 @@ final class RS485 extends RS485Port { + + static + { +- System.loadLibrary( "rxtxRS485" ); ++ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxRS485" )); + Initialize(); + } + +diff -up ./src/gnu/io/RXTXVersion.java.load ./src/gnu/io/RXTXVersion.java +--- ./src/gnu/io/RXTXVersion.java.load 2010-02-11 17:30:43.369692527 +0100 ++++ ./src/gnu/io/RXTXVersion.java 2010-02-11 17:35:43.756816257 +0100 +@@ -90,7 +90,8 @@ public class RXTXVersion + public static native String nativeGetVersion(); + + static void loadLibrary (String baseName) { +- if (System.getProperty("sun.arch.data.model", "").equals("64")) { ++ System.load("@JNIPATH@/" + System.mapLibraryName(baseName)); ++ /*if (System.getProperty("sun.arch.data.model", "").equals("64")) { + try { + System.loadLibrary(baseName + "64"); + } catch (UnsatisfiedLinkError ex64) { +@@ -110,7 +111,7 @@ public class RXTXVersion + throw ex32; + } + } +- } ++ }*/ + } + + } +diff -up ./src/gnu/io/Raw.java.load ./src/gnu/io/Raw.java +--- ./src/gnu/io/Raw.java.load 2010-02-11 17:30:43.368679594 +0100 ++++ ./src/gnu/io/Raw.java 2010-02-11 17:31:56.086923010 +0100 +@@ -71,7 +71,7 @@ final class Raw extends RawPort { + + static + { +- System.loadLibrary( "rxtxRaw" ); ++ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxRaw" )); + Initialize(); + } + +diff -up ./src/gnu/io/Zystem.java.load ./src/gnu/io/Zystem.java diff --git a/rxtx.spec b/rxtx.spec index 4b4c204..34f9688 100644 --- a/rxtx.spec +++ b/rxtx.spec @@ -1,8 +1,13 @@ -%define upver 2.1 -%define uprel 7r2 -%define rel 0.8 -#define jni %{_jnidir} -%define jni %{_libdir}/%{name} +#global upver 2.1 +#global uprel 7r2 +#global rel 0.8 + +%global upver 2.2 +%global uprel 20100211 +%global rel 0.1 + +#global jni %{_jnidir} +%global jni %{_libdir}/%{name} Summary: Parallel communication for the Java Development Toolkit Name: rxtx @@ -11,10 +16,13 @@ Release: %{rel}.%{uprel}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://rxtx.qbang.org/ -Source: http://rxtx.qbang.org/pub/rxtx/%{name}-%{upver}-%{uprel}.tgz +# The source for this package was pulled from upstream's vcs. Use the +# following commands to generate the tarball: +# cvs -d:pserver:anonymous@qbang.org:/var/cvs/cvsroot co -r commapi-0-0-1 -D "2010-02-11" -d rxtx-%{uprel} rxtx-devel +# 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 -Patch2: %{name}-%{version}-configure.patch -Patch3: %{name}-%{version}-uts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-devel @@ -33,16 +41,14 @@ rxtx is an full implementation of java commapi which aims to support RS232 IEEE 1284, RS485, I2C and RawIO. %prep -%setup -q -n rxtx-%{upver}-%{uprel} +#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 -b .p2 -%patch3 -p1 -b .p3 # remove prebuild binaries find . -name '*.jar' -exec rm {} \; find . -name '*.hqx' -exec rm {} \; %build -autoconf export JAVA_HOME=%{java_home} %configure # parallel make fails with make %%{?_smp_mflags} @@ -67,6 +73,9 @@ rm -rf %{buildroot} %{jni} %changelog +* Thu Feb 11 2010 Levente Farkas - 2.2-0.1.20100211 +- update to the latest cvs to fix #555219 + * Wed Aug 12 2009 Ville Skyttä - 2.1-0.8.7r2 - Use upstream gzipped tarball instead of zip. diff --git a/sources b/sources index 8d9cea9..540d3ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aea33fc2d34972426da4eb5edc9b1b97 rxtx-2.1-7r2.tgz +3cc2b3b6be0652c54488863e07b5f4bf rxtx-20100211.tar.bz2