[packages/java-jna] Version: 4.2.1, ant deps updated

[jajcus]

commit ca1894acd9c19fb158e439b4439aef842a943d7e
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Tue Oct 27 12:37:57 2015 +0100

    Version: 4.2.1, ant deps updated

 java-jna.spec      | 11 +++++------
 jna-nonative.patch | 16 +++++++++++++---
 jna-soname.patch   | 17 +++++++++++------
 3 files changed, 29 insertions(+), 15 deletions(-)
---
diff --git a/java-jna.spec b/java-jna.spec
index 39fdbe3..d8ca411 100644
--- a/java-jna.spec
+++ b/java-jna.spec
@@ -7,22 +7,22 @@
 Summary:	Easy access to native shared libraries from Java
 Summary(pl.UTF-8):	Prosty dostęp do natywnych bibliotek współdzielonych z poziomu Javy
 Name:		java-jna
-Version:	4.0
+Version:	4.2.1
 Release:	1
 License:	LGPL v2.1 or Apache v2.0
 Group:		Libraries/Java
-Source0:	https://github.com/twall/jna/archive/%{version}/jna-%{version}.tar.gz
-# Source0-md5:	be0320402c93d33426e51aeb0ff34eec
+Source0:	https://github.com/java-native-access/jna/archive/%{version}/jna-%{version}.tar.gz
+# Source0-md5:	899675953b365fc4e0da6b7eb7802a8e
 # Note: by default jna.jar contains versions of native libjnidispatch
 # for many systems/architectures; this patch disables such packaging;
 # we package libjnidispatch.so as normal native library instead
 Patch0:		jna-nonative.patch
 Patch1:		jna-soname.patch
-URL:		https://jna.java.net/
-BuildRequires:	ant-nodeps
+URL:		https://github.com/java-native-access/jna/
 %if %(locale -a | grep -q '^en_US$'; echo $?)%(locale -a | grep -q '^en_US\.UTF-8$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
+BuildRequires:	ant >= 1.9.0
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -38,7 +38,6 @@ BuildRequires:	pkgconfig
 %if %{with tests}
 BuildRequires:	java-junit
 BuildRequires:	ant-junit
-BuildRequires:	ant-trax
 %endif
 Requires:	jpackage-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/jna-nonative.patch b/jna-nonative.patch
index 61a7640..1b1112e 100644
--- a/jna-nonative.patch
+++ b/jna-nonative.patch
@@ -1,6 +1,7 @@
---- jna-4.0/build.xml.orig	2013-07-04 20:42:30.000000000 +0200
-+++ jna-4.0/build.xml	2013-09-22 14:30:40.805468201 +0200
-@@ -416,66 +416,6 @@
+diff -dur jna-4.2.1.orig/build.xml jna-4.2.1/build.xml
+--- jna-4.2.1.orig/build.xml	2015-10-18 14:40:13.000000000 +0200
++++ jna-4.2.1/build.xml	2015-10-27 12:15:47.000000000 +0100
+@@ -441,75 +441,6 @@
        <fileset dir="${classes}" excludes="${jar.omitted}">
          <patternset refid="jar-compiled"/>
        </fileset>
@@ -25,6 +26,9 @@
 -      <zipfileset src="${lib.native}/linux-arm.jar"
 -                  includes="*jnidispatch*"
 -                  prefix="com/sun/jna/linux-arm"/>
+-      <zipfileset src="${lib.native}/linux-aarch64.jar"
+-                  includes="*jnidispatch*"
+-                  prefix="com/sun/jna/linux-aarch64"/>
 -      <zipfileset src="${lib.native}/linux-ia64.jar"
 -                  includes="*jnidispatch*"
 -                  prefix="com/sun/jna/linux-ia64"/>
@@ -34,6 +38,12 @@
 -      <zipfileset src="${lib.native}/linux-ppc64.jar"
 -                  includes="*jnidispatch*"
 -                  prefix="com/sun/jna/linux-ppc64"/>
+-      <zipfileset src="${lib.native}/linux-ppc64le.jar"
+-                  includes="*jnidispatch*"
+-                  prefix="com/sun/jna/linux-ppc64le"/>
+-      <zipfileset src="${lib.native}/linux-sparcv9.jar"
+-                  includes="*jnidispatch*"
+-                  prefix="com/sun/jna/linux-sparcv9"/>
 -      <zipfileset src="${lib.native}/sunos-x86.jar"
 -                  includes="*jnidispatch*"
 -                  prefix="com/sun/jna/sunos-x86"/>
diff --git a/jna-soname.patch b/jna-soname.patch
index 0426b73..cf28546 100644
--- a/jna-soname.patch
+++ b/jna-soname.patch
@@ -1,6 +1,7 @@
---- jna-4.0/native/Makefile.orig	2013-07-04 20:42:30.000000000 +0200
-+++ jna-4.0/native/Makefile	2013-09-22 14:54:44.712074273 +0200
-@@ -66,6 +66,7 @@
+diff -dur jna-4.2.1.orig/native/Makefile jna-4.2.1/native/Makefile
+--- jna-4.2.1.orig/native/Makefile	2015-10-18 14:40:13.000000000 +0200
++++ jna-4.2.1/native/Makefile	2015-10-27 12:17:47.000000000 +0100
+@@ -69,6 +69,7 @@
  FFI_ENV=CC="$(CC)" CFLAGS="$(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)"
  FFI_CONFIG=--enable-static --disable-shared --with-pic=yes
  endif
@@ -8,12 +9,16 @@
  LIBRARY=$(BUILD)/$(LIBPFX)jnidispatch$(JNISFX)
  TESTLIB=$(BUILD)/$(LIBPFX)testlib$(LIBSFX)
  TESTLIB_JAR=$(BUILD)/$(LIBPFX)testlib-jar$(LIBSFX)
-@@ -243,7 +244,7 @@
- ARCH=$(shell uname -m | sed 's/i.86/i386/g')
+@@ -260,10 +261,10 @@
  PCFLAGS+=-fPIC
  CDEFINES+=-DHAVE_PROTECTION
+ ifeq ($(DYNAMIC_LIBFFI),true)
 -LDFLAGS+=-Wl,-soname,$@
 +LDFLAGS+=-Wl,-soname,$(LIBBASE)
+ else
+ # Ensure we bind to local libffi symbols
+-LDFLAGS+=-Wl,-soname,$@,-Bsymbolic
++LDFLAGS+=-Wl,-soname,$(LIBBASE),-Bsymbolic
+ endif
  endif
  
- ifneq (,$(findstring bsd,$(OS)))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-jna.git/commitdiff/6b7011f3628e591b28ec32e136bc3fa00d10a720