From d55d5ab7695362c52effc45c2325a44138c83ef8 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mar 31 2017 13:47:47 +0000
Subject: Add OSGi metadata

Minor spec file cleanup

---

diff --git a/rxtx-osgi.bnd b/rxtx-osgi.bnd
new file mode 100644
index 0000000..3c6ffd1
--- /dev/null
+++ b/rxtx-osgi.bnd
@@ -0,0 +1,2 @@
+Bundle-SymbolicName: gnu.io.rxtx
+Export-Package: gnu.io
diff --git a/rxtx.spec b/rxtx.spec
index 08d1d1d..1a1bf85 100644
--- a/rxtx.spec
+++ b/rxtx.spec
@@ -1,60 +1,47 @@
-#global upver	2.1
-#global uprel	7r2
-#global rel	0.8
-
 %global upver	2.2
 %global uprel	20100211
-%global rel	0.14
 
-#global jni	%{_jnidir}
 %global jni	%{_libdir}/%{name}
 
 Summary:	Parallel communication for the Java Development Toolkit
 Name:		rxtx
 Version:	%{upver}
-Release:	%{rel}.%{uprel}%{?dist}.4
+Release:	0.15.%{uprel}%{?dist}
 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@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
+#  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}
+Source0:	%{name}-%{uprel}.tar.bz2
 Source1:	README.fedora
+Source2:	rxtx-osgi.bnd
 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-2.2-Add-Arduino-driver-ttyACM-rxtxcomm-as-device.patch
 Patch6:		rxtx-2.2-java-version-fix.patch
-Patch7:         rxtx-2.2-convert-strcpy-to-strncpy.patch
+Patch7:		rxtx-2.2-convert-strcpy-to-strncpy.patch
 
-#BuildRequires:	java-devel >= 1:1.6.0
-BuildRequires:	java-devel
-BuildRequires:	jpackage-utils
 BuildRequires:	libtool automake
-BuildRequires:	ant >= 1.7.0
-BuildRequires:	ant-junit >= 1.7.0
+BuildRequires:	ant
+BuildRequires:	ant-junit
 BuildRequires:	junit
-BuildRequires:	maven-local
-#Requires:	java >= 1:1.6.0
-Requires:	java-headless
-Requires:	jpackage-utils
-ExcludeArch:	ppc ppc64 s390 s390x
+BuildRequires:	aqute-bnd
+BuildRequires:	javapackages-local
+ExcludeArch:	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
+%if 0%{?fedora} || 0%{?rhel} > 6
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -65,6 +52,9 @@ find . -name '*.jar' -exec rm {} \;
 find . -name '*.hqx' -exec rm {} \;
 cp -a %{SOURCE1} .
 
+# Don't need to install jar file, mvn_install will do it
+sed -i -e '/JHOME/d' Makefile.in
+
 %build
 export JAVA_HOME=%{java_home}
 %configure
@@ -73,26 +63,29 @@ make
 iconv -f ISO_8859-1 -t UTF-8 ChangeLog >ChangeLog.utf-8
 mv ChangeLog.utf-8 ChangeLog
 
+# Inject OSGi metadata
+bnd wrap -p %{SOURCE2} -v %{version} -o RXTXcomm-bnd.jar RXTXcomm.jar
+mv RXTXcomm-bnd.jar RXTXcomm.jar
+
 %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
+mkdir -p %{buildroot}%{jni}
+make RXTX_PATH=%{buildroot}%{jni} install
 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 README.fedora
-%{_javadir}/*
-%{_jnidir}/*
+%files -f .mfiles
+%license COPYING
+%doc AUTHORS ChangeLog README TODO README.fedora
 %{jni}
-%attr(644, root, root) %{_datadir}/maven-metadata/%{name}.xml
 
 %changelog
+* Fri Mar 31 2017 Mat Booth <mat.booth@redhat.com> - 2.2-0.15.20100211
+- Add OSGi metadata
+- Minor spec file cleanup
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-0.14.20100211.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild