rpms/rxtx/devel rxtx-2.2-loadlibrary.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.1, 1.2 rxtx.spec, 1.8, 1.9 sources, 1.3, 1.4 rxtx-2.1-configure.patch, 1.1, NONE rxtx-2.1-loadlibrary.patch, 1.1, NONE rxtx-2.1-uts.patch, 1.1, NONE
Levente Farkas
lfarkas at fedoraproject.org
Thu Feb 11 17:05:53 UTC 2010
Author: lfarkas
Update of /cvs/pkgs/rpms/rxtx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10503/devel
Modified Files:
.cvsignore import.log rxtx.spec sources
Added Files:
rxtx-2.2-loadlibrary.patch
Removed Files:
rxtx-2.1-configure.patch rxtx-2.1-loadlibrary.patch
rxtx-2.1-uts.patch
Log Message:
update to the latest cvs
rxtx-2.2-loadlibrary.patch:
CommPortIdentifier.java | 2 +-
I2C.java | 2 +-
RS485.java | 2 +-
RXTXVersion.java | 5 +++--
Raw.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
--- NEW FILE rxtx-2.2-loadlibrary.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rxtx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 12 Aug 2009 19:34:27 -0000 1.3
+++ .cvsignore 11 Feb 2010 17:05:50 -0000 1.4
@@ -1 +1 @@
-rxtx-2.1-7r2.tgz
+rxtx-20100211.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rxtx/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 20 Oct 2008 19:50:30 -0000 1.1
+++ import.log 11 Feb 2010 17:05:50 -0000 1.2
@@ -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:HEAD:rxtx-2.2-0.1.20100211.fc12.src.rpm:1265907912
Index: rxtx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rxtx/devel/rxtx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rxtx.spec 12 Aug 2009 19:34:27 -0000 1.8
+++ rxtx.spec 11 Feb 2010 17:05:51 -0000 1.9
@@ -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 at 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 c
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 <lfarkas at lfarkas.org> - 2.2-0.1.20100211
+- update to the latest cvs to fix #555219
+
* Wed Aug 12 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.1-0.8.7r2
- Use upstream gzipped tarball instead of zip.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rxtx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 12 Aug 2009 19:34:27 -0000 1.3
+++ sources 11 Feb 2010 17:05:51 -0000 1.4
@@ -1 +1 @@
-aea33fc2d34972426da4eb5edc9b1b97 rxtx-2.1-7r2.tgz
+3cc2b3b6be0652c54488863e07b5f4bf rxtx-20100211.tar.bz2
--- rxtx-2.1-configure.patch DELETED ---
--- rxtx-2.1-loadlibrary.patch DELETED ---
--- rxtx-2.1-uts.patch DELETED ---
More information about the scm-commits
mailing list