[rxtx/f21: 5/6] Merge branch 'master' into f21
Levente Farkas
lfarkas at fedoraproject.org
Fri Feb 27 11:06:49 UTC 2015
commit 028ba40ebb28aa186ce7c840052faae2e2fb1628
Merge: 2794e91 bfdcf1b
Author: Levente Farkas <lfarkas at lfarkas.org>
Date: Fri Feb 27 12:05:47 2015 +0100
Merge branch 'master' into f21
Conflicts:
rxtx.spec
rxtx-2.2-no-io.h.patch | 4 +-
rxtx-aarch64.patch | 1689 ------------------------------------------------
rxtx.spec | 155 -----
3 files changed, 3 insertions(+), 1845 deletions(-)
---
diff --cc rxtx.spec
index d9cc391,c6b361a..e69de29
--- a/rxtx.spec
+++ b/rxtx.spec
@@@ -1,155 -1,176 +1,0 @@@
--#global upver 2.1
--#global uprel 7r2
--#global rel 0.8
--
--%global upver 2.2
--%global uprel 20100211
- %global rel 0.9
-%global rel 0.10
--
--#global jni %{_jnidir}
--%global jni %{_libdir}/%{name}
--
--Summary: Parallel communication for the Java Development Toolkit
--Name: rxtx
--Version: %{upver}
- Release: %{rel}.%{uprel}.2%{?dist}.1
-Release: %{rel}.%{uprel}%{?dist}.2
--License: LGPLv2+
--Group: System Environment/Libraries
--URL: http://rxtx.qbang.org/
--# 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: rxtx-2.2-loadlibrary.patch
--Patch2: rxtx-2.2-no-io.h.patch
--Patch3: rxtx-2.2-fhs_lock.patch
--Patch4: rxtx-2.2-lock.patch
- Patch5: rxtx-aarch64.patch
--
--#BuildRequires: java-devel >= 1:1.6.0
--BuildRequires: java-devel
--BuildRequires: jpackage-utils
- BuildRequires: libtool automake
-BuildRequires: libtool automake
--BuildRequires: ant >= 1.7.0
--BuildRequires: ant-junit >= 1.7.0
--BuildRequires: junit
-BuildRequires: maven-local
--#Requires: java >= 1:1.6.0
--Requires: java-headless
--Requires: jpackage-utils
--ExcludeArch: ppc ppc64 s390 s390x
--
--%description
--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-%{uprel}
--sed -e 's|@JNIPATH@|%{jni}|' %{PATCH1} | patch -s -b --suffix .p1 -p1
--%patch2 -p1
--%patch3 -p1
--%if 0%{?fedora} > 13 || 0%{?rhel} > 6
--%patch4 -p1
- %patch5 -p1
--%endif
--# remove prebuild binaries
--find . -name '*.jar' -exec rm {} \;
--find . -name '*.hqx' -exec rm {} \;
--
--%build
--export JAVA_HOME=%{java_home}
--%configure
--# parallel make fails with make %%{?_smp_mflags}
--make
--iconv -f ISO_8859-1 -t UTF-8 ChangeLog >ChangeLog.utf-8
--mv ChangeLog.utf-8 ChangeLog
--
--%install
--mkdir -p %{buildroot}%{_javadir} %{buildroot}%{jni}
--make RXTX_PATH=%{buildroot}%{jni} JHOME=%{buildroot}%{_javadir} install
--#echo "Driver=gnu.io.RXTXCommDriver" > %{buildroot}%{_javadir}/gnu.io.rxtx.properties
--find %{buildroot} -name '*.la' -exec rm {} \;
-
-%mvn_artifact org.rxtx:rxtx:%{version} RXTXcomm.jar
-%mvn_file org.rxtx:rxtx:%{version} RXTXcomm
-%mvn_install
-rm -f %{buildroot}%{_datadir}/java/RXTXcomm.jar
-ln -s %{_jnidir}/RXTXcomm.jar \
- %{buildroot}%{_datadir}/java/RXTXcomm.jar
--
--
--%files
--%doc AUTHORS COPYING ChangeLog INSTALL README TODO
--%{_javadir}/*
-%{_jnidir}/*
--%{jni}
-%{_datadir}/maven-metadata/%{name}.xml
--
--%changelog
- * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.9.20100211.2.1
-* Thu Feb 26 2015 Alec Leamas <leamas.alec at gmail.com> - 2.2-0.10.20100211.2
-- Use mvn_artifact et. al. instead of deprecated add_maven_depmap.
-- Fix packaging bug with jni-related jar in /usr/share/java.
-
-* Tue Feb 24 2015 Alec Leamas <leamas.alec at gmail.com> - 2.2-0.10.20100211.1
-- Add add_maven_depmap, provide meta informtation.
-
-* Tue Sep 16 2014 Peter Robinson <pbrobinson at fedoraproject.org> 2.2-0.10.20100211
-- Bump to fix NVR
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.9.20100211.2.2
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Mon Aug 04 2014 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 2.2-0.8.20100211.2.2
-- Handle lack of sys/io.h on AArch64
--
--* Wed Jul 30 2014 Peter Robinson <pbrobinson at fedoraproject.org> 2.2-0.8.20100211.2.1
--- Update deps to fix FTBFS
--
--* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.7.20100211.2.1
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
--
--* Fri Mar 28 2014 Michael Simacek <msimacek at redhat.com> - 2.2-0.7.20100211.2
--- Use Requires: java-headless rebuild (#1067528)
--
--* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.7.20100211.1
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
--
--* Thu Apr 11 2013 Levente Farkas <lfarkas at lfarkas.org> - 2.2-0.7.20100211
--- add patch for #926466 by Dennis Gilmore
--
--* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.6.20100211.3
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
--
--* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.6.20100211.2
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
--
--* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-0.6.20100211.1
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--
--* Wed Aug 17 2011 Levente Farkas <lfarkas at lfarkas.org> - 2.2-0.6.20100211
--- fix lock dir #731218
--
--* Fri Jul 15 2011 Levente Farkas <lfarkas at lfarkas.org> - 2.2-0.5.20100211
--- fix doc #722353
--
--* 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
--
--* 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
--
--* 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.
--
--* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.7.7r2
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--
--* Tue Jun 2 2009 Dan Horak <dan[at]danny.cz> - 2.1-0.6.7r2
--- add s390/s390x to ExcludeArch
--
--* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.5.7r2
--- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--
--* Mon Feb 16 2009 Levente Farkas <lfarkas at lfarkas.org> - 2.1-0.4.7r2
--- bump release number
--
--* Fri Feb 13 2009 Levente Farkas <lfarkas at lfarkas.org> - 2.1-0.3.7r2
--- fix new libtool compile bug
--
--* Thu Sep 25 2008 Levente Farkas <lfarkas at lfarkas.org> - 2.1-0.2.7r2
--- a few more spec file cleanup
--
--* Mon Sep 15 2008 Levente Farkas <lfarkas at lfarkas.org> - 2.1-0.1.7r2
--- update as requested by fedora
--
- * Thu Jul 21 2008 Gergo Csontos <gergo.csontos at gmail.com> - 2.1
-* Mon Jul 21 2008 Gergo Csontos <gergo.csontos at gmail.com> - 2.1
--- Initial release
More information about the scm-commits
mailing list