[native-platform] Don't install JAR with embedded DSO

[Mikolaj Izdebski]

commit 318155d854fa346c8ed3bfc713a5e557bcc32689
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Oct 21 15:38:02 2014 +0200

    Don't install JAR with embedded DSO

 native-platform-0.10.pom     |   14 --------------
 native-platform-0.7-Makefile |    4 ++--
 native-platform.spec         |   24 ++++++++++--------------
 3 files changed, 12 insertions(+), 30 deletions(-)
---
diff --git a/native-platform-0.7-Makefile b/native-platform-0.7-Makefile
index 68e232a..3a8e36b 100644
--- a/native-platform-0.7-Makefile
+++ b/native-platform-0.7-Makefile
@@ -29,8 +29,8 @@ JSOURCE=1.5
 INCLUDE=-I$(IDIR) -I$(IGEN) -I/usr/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 #LDLIBS=-lncurses
 
-_OBJ_STD = generic.o generic_posix.o linux.o osx.o posix.o win.o
-_OBJ_CURSES = generic.o generic_posix.o curses.o
+_OBJ_STD = generic.o generic_posix.o linux.o osx.o posix.o win.o unix_strings.o
+_OBJ_CURSES = generic.o generic_posix.o curses.o unix_strings.o
 OBJ_STD = $(patsubst %,$(ODIR)/%,$(_OBJ_STD))
 OBJ_CURSES = $(patsubst %,$(ODIR)/%,$(_OBJ_CURSES))
 _JAVA = $(shell find $(JSRCDIR) -name "*.java" -print)
diff --git a/native-platform.spec b/native-platform.spec
index 8b729e1..e6c8c50 100644
--- a/native-platform.spec
+++ b/native-platform.spec
@@ -5,15 +5,14 @@
 
 Name:          native-platform
 Version:       0.10
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Java bindings for various native APIs
 License:       ASL 2.0
 URL:           https://github.com/adammurdoch/native-platform
 Source0:       https://github.com/adammurdoch/native-platform/archive/%{namedversion}.tar.gz
-Source1:       %{name}-%{namedversion}.pom
 # From Debian
 Source4:       %{name}-0.7-Makefile
-# Try to load native library first from /usr/lib*/native-platform
+# Try to load native library from /usr/lib*/native-platform
 # instead of extractDir or classpath.
 Patch0:        %{name}-0.10-NativeLibraryLocator.patch
 # Use generate libraries without arch references
@@ -25,7 +24,6 @@ BuildRequires: java-devel
 BuildRequires: javapackages-local
 BuildRequires: ncurses-devel
 BuildRequires: jopt-simple
-BuildRequires: bsh
 
 %description
 A collection of cross-platform Java APIs
@@ -50,7 +48,6 @@ find .  -name "*.class" -delete
 %patch0 -p0
 %patch1 -p0
 
-cp -p %{SOURCE1} pom.xml
 cp -p %{SOURCE4} Makefile
 
 chmod 644 readme.md
@@ -67,19 +64,14 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
 LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS;
 make %{?_smp_mflags} JAVA_HOME=%{_jvmdir}/java
 
-%mvn_artifact pom.xml build/%{name}.jar
-%mvn_file net.rubygrapefruit:%{name} %{name}
-
-arch=$(echo 'print(System.getProperty("os.arch"));' | java -cp $(build-classpath bsh) bsh.Interpreter /dev/stdin)
-%mvn_file net.rubygrapefruit:%{name}-linux-amd64 %{name}-linux
-%mvn_artifact net.rubygrapefruit:%{name}-linux:%{version} build/%{name}-linux.jar
-%mvn_alias :%{name}-linux :%{name}-linux-$arch
+%mvn_artifact net.rubygrapefruit:%{name}:%{version} build/%{name}.jar
+%mvn_file : %{name}
 
 %install
 %mvn_install -J build/docs/javadoc
 mkdir -p %{buildroot}%{_libdir}/%{name}
-install -pm 0755 build/binaries/libnative-platform-curses.so %{buildroot}%{_libdir}/%{name}
-install -pm 0755 build/binaries/libnative-platform.so %{buildroot}%{_libdir}/%{name}
+install -pm 0755 build/binaries/libnative-platform-curses.so %{buildroot}%{_libdir}/%{name}/
+install -pm 0755 build/binaries/libnative-platform.so %{buildroot}%{_libdir}/%{name}/
 
 %files -f .mfiles
 %{_libdir}/%{name}
@@ -89,6 +81,10 @@ install -pm 0755 build/binaries/libnative-platform.so %{buildroot}%{_libdir}/%{n
 %doc LICENSE
 
 %changelog
+* Tue Oct 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10-4
+- Don't install JAR with embedded DSO
+- Include unix_strings.o in DSO
+
 * Tue Oct 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10-3
 - Restore DSO installed in libdir