From a3cb1177eea509b421345498cb15204337a65017 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 11 Dec 2023 15:46:49 +0100 Subject: [PATCH] Rebase to 5.14.0 version Resolves: #2253929 --- .gitignore | 1 + 0007-Support-openjdk-17.patch | 41 +---------------------------------- jna.spec | 7 ++++-- sources | 2 +- 4 files changed, 8 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 2c4d409..ff411bc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ jna-3.2.7.tar.bz2 /jna-5.11.0-clean.tar.xz /jna-5.12.1-clean.tar.xz /jna-5.13.0-clean.tar.xz +/jna-5.14.0-clean.tar.xz diff --git a/0007-Support-openjdk-17.patch b/0007-Support-openjdk-17.patch index 4c76bcd..062fae4 100644 --- a/0007-Support-openjdk-17.patch +++ b/0007-Support-openjdk-17.patch @@ -12,13 +12,11 @@ Subject: [PATCH] Support-openjdk-17 contrib/msoffice/build.xml | 4 ++-- contrib/native_window_msg/build.xml | 4 ++-- contrib/ntservice/nbproject/project.properties | 4 ++-- - contrib/platform/nbproject/project.properties | 4 ++-- contrib/shapedwindowdemo/build.xml | 4 ++-- contrib/w32printing/build.xml | 4 ++-- contrib/w32windowhooks/build.xml | 4 ++-- contrib/x11/build.xml | 4 ++-- - nbproject/project.xml | 4 ++-- - 14 files changed, 28 insertions(+), 28 deletions(-) + 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/contrib/alphamaskdemo/build.xml b/contrib/alphamaskdemo/build.xml index 2186daadd..9e4a2072e 100644 @@ -147,21 +145,6 @@ index 587ae2b4d..d30a26c83 100644 file.reference.jna.jar=../../build/jna.jar application.vendor=matthias junit.selected.version=4 -diff --git a/contrib/platform/nbproject/project.properties b/contrib/platform/nbproject/project.properties -index fe6ceb756..da40cd9a9 100644 ---- a/contrib/platform/nbproject/project.properties -+++ b/contrib/platform/nbproject/project.properties -@@ -52,8 +52,8 @@ javac.classpath=\ - # Space-separated list of extra javac options - javac.compilerargs=-XDignore.symbol.file - javac.deprecation=false --javac.source=1.6 --javac.target=1.6 -+javac.source=1.8 -+javac.target=1.8 - javac.test.classpath=\ - ${javac.classpath}:\ - ${file.reference.jna-test.jar}:\ diff --git a/contrib/shapedwindowdemo/build.xml b/contrib/shapedwindowdemo/build.xml index 24c25b5cc..b4f8c995d 100644 --- a/contrib/shapedwindowdemo/build.xml @@ -222,28 +205,6 @@ index ecf2ae5f9..95f5e8a88 100644 -diff --git a/nbproject/project.xml b/nbproject/project.xml -index c05eefc13..9cd22da94 100644 ---- a/nbproject/project.xml -+++ b/nbproject/project.xml -@@ -141,7 +141,7 @@ auxiliary.show.customizer.message= - - src - src -- 1.6 -+ 1.8 - - - test -@@ -152,7 +152,7 @@ auxiliary.show.customizer.message= - - ant-tools-src - src:lib/ant.jar:lib/asm-8.0.1.jar -- 1.6 -+ 1.8 - - - -- 2.31.1 diff --git a/jna.spec b/jna.spec index 326c0ef..e0f47ee 100644 --- a/jna.spec +++ b/jna.spec @@ -6,8 +6,8 @@ %endif Name: jna -Version: 5.13.0 -Release: 3%{?dist} +Version: 5.14.0 +Release: 1%{?dist} Summary: Pure Java access to native libraries # Most of code is dual-licensed under either LGPL 2.1+ only or Apache # License 2.0. WeakIdentityHashMap.java was taken from Apache CXF, @@ -167,6 +167,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ %changelog +* Mon Dec 11 2023 Zuzana Miklankova - 5.14.0-1 +- Rebase to version 5.14.0 + * Thu Jul 20 2023 Fedora Release Engineering - 5.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 237f9e4..15beb3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jna-5.13.0-clean.tar.xz) = fdff67802e3f07801a0db7ae4215b0a5954e4238b63d5c02ad4d0b1d84668dcd26c44412bb2b0e86376b71ad2284f1fbefe3370e28b6e7225d06b330fbee6129 +SHA512 (jna-5.14.0-clean.tar.xz) = 26b1d222f155f7fb785552592f863ad72ac2b04fcfe3c6ea8ad85d16f7d77ae33d5b3f2d17684f0ea612c8680c12e1cd98f699f35ec514dbd044ba19bb4aa9c8