[rxtx] fix #1196849

[Levente Farkas]

commit bfdcf1bd6eca0e4f3345162fb30b896d46b6d4e1
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Fri Feb 27 11:35:05 2015 +0100

    fix #1196849

 rxtx.spec | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/rxtx.spec b/rxtx.spec
index 34db4ef..c6b361a 100644
--- a/rxtx.spec
+++ b/rxtx.spec
@@ -12,7 +12,7 @@
 Summary:	Parallel communication for the Java Development Toolkit
 Name:		rxtx
 Version:	%{upver}
-Release:	%{rel}.%{uprel}%{?dist}
+Release:	%{rel}.%{uprel}%{?dist}.2
 License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://rxtx.qbang.org/
@@ -30,10 +30,11 @@ Patch4:		rxtx-2.2-lock.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
@@ -70,13 +71,29 @@ 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
+* 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
 
@@ -155,5 +172,5 @@ find %{buildroot} -name '*.la' -exec rm {} \;
 * 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