[rxtx] add which is already added
Levente Farkas
lfarkas at fedoraproject.org
Mon Sep 6 12:07:23 UTC 2010
commit e1ae36a4c6955d68ce5e7a0c300926d5d9a41efe
Author: Levente Farkas <lfarkas at lfarkas.org>
Date: Mon Sep 6 14:07:05 2010 +0200
add which is already added
rxtx.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
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 <dennis at ausil.us> - 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 <lfarkas at lfarkas.org> - 2.2-0.1.20100211
- update to the latest cvs to fix #555219
More information about the scm-commits
mailing list