- up to 5.5.0

diff --git a/java-jna.spec b/java-jna.spec
index b39c88707cb8b372125be9a695f1b2d423fdbaaf..d502d45f29c77c25497d617e42a30543d28e24c8 100644 (file)
--- a/java-jna.spec
+++ b/java-jna.spec
@@ -6,13 +6,13 @@
 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.5.1
+Version:       5.5.0
 Release:       1
 License:       LGPL v2.1 or Apache v2.0
 Group:         Libraries/Java
 #Source0Download: https://github.com/java-native-access/jna/releases
 Source0:       https://github.com/java-native-access/jna/archive/%{version}/jna-%{version}.tar.gz
-# Source0-md5: 3cf5c206ba2246386af2e9248fa6f035
+# Source0-md5: 12df44bb982fb1250687b58f8e23a0de
 # 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

diff --git a/jna-nonative.patch b/jna-nonative.patch
index e340828f3080748ee29f2286f89f7d4ac3d44d15..e7e19d6e8b21f2c5d3eefed16aa8572d4606d690 100644 (file)
--- a/jna-nonative.patch
+++ b/jna-nonative.patch
@@ -1,6 +1,6 @@
---- jna-4.5.1/build.xml.orig   2018-06-28 19:41:44.691496684 +0200
-+++ jna-4.5.1/build.xml        2018-06-28 19:45:43.404827190 +0200
-@@ -492,84 +492,6 @@
+--- jna-5.5.0/build.xml~       2019-10-30 17:41:18.000000000 +0100
++++ jna-5.5.0/build.xml        2020-05-01 13:28:12.569529122 +0200
+@@ -506,84 +506,6 @@
        <fileset dir="${classes}" excludes="${jar.omitted}">
          <patternset refid="jar-compiled"/>
        </fileset>
@@ -82,10 +82,10 @@
 -      <zipfileset src="${lib.native}/w32ce-arm.jar"
 -                  includes="*jnidispatch*"
 -                  prefix="com/sun/jna/w32ce-arm"/>
-     </jar>
-     <zip zipfile="${build}/${minjar}">
-       <zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
-@@ -523,27 +523,6 @@
+       <zipfileset dir="."
+                   includes="LICENSE,LGPL2.1,AL2.0"
+                   prefix="META-INF"/>
+@@ -618,27 +540,6 @@
            <fileset file="${build}/${minjar}"/>
            <globmapper from="*" to="classes.jar"/>
          </mappedresources>

diff --git a/jna-tmpdir.patch b/jna-tmpdir.patch
index 3e059db283c3d000ae58455b05fec8b101dced3f..05ba08999b475c34f797c84d129a46553498289e 100644 (file)
--- a/jna-tmpdir.patch
+++ b/jna-tmpdir.patch
@@ -2,11 +2,11 @@ diff -dur jna-4.2.1.orig/build.xml jna-4.2.1/build.xml
 --- jna-4.2.1.orig/build.xml   2015-10-27 12:39:07.000000000 +0100
 +++ jna-4.2.1/build.xml        2015-10-27 12:39:38.000000000 +0100
 @@ -929,6 +929,8 @@
-       <sysproperty key="jna.protected" value="true"/>
+       <sysproperty key="jna.nosys" value="true"/>
        <sysproperty key="jna.builddir" file="${build}"/>
        <sysproperty key="jna.nativedir" file="${build.native}"/>
 +      <sysproperty key="java.io.tmpdir" file="${build}/tmp"/>
 +      <sysproperty key="jna.tmpdir" file="${build}/tmp"/>
-       <jvmarg value="${vmopt.arch}"/>
        <classpath><path refid="test.runpath"/></classpath>
        <formatter type="brief" usefile="false"/>
+       <formatter type="xml"/>