From 6ca981057a7a76856a3f71f47d5a335c634ca810 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 26 Mar 2025 08:43:19 +0100
Subject: [PATCH 1/7] Switch to javapackages tests from CentOS Stream GitLab

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 1e5c8de..36643ec 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
   ref: main
 execute:
   how: tmt

From 053bc923a578f81177dc8706fc8f3e86e2558155 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 4 Jun 2025 13:34:11 +0200
Subject: [PATCH 2/7] Drop javadoc subpackage

---
 jna.spec | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/jna.spec b/jna.spec
index 064cade..b04b40e 100644
--- a/jna.spec
+++ b/jna.spec
@@ -59,6 +59,9 @@ BuildRequires:  hamcrest
 BuildRequires:  reflections
 %endif
 
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 5.15.0-4
+
 %description
 JNA provides Java programs easy access to native shared libraries
 (DLLs on Windows) without writing anything but Java code. JNA's
@@ -67,13 +70,6 @@ minimum of effort. No boilerplate or generated code is required.
 While some attention is paid to performance, correctness and ease
 of use take priority.
 
-%package        javadoc
-Summary:        Javadocs for %{name}
-BuildArch:      noarch
-
-%description    javadoc
-This package contains the javadocs for %{name}.
-
 %package        contrib
 Summary:        Contrib for %{name}
 License:        LGPLv2+ or ASL 2.0
@@ -142,16 +138,13 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
 %mvn_artifact pom-jna.xml build/jna-min.jar
 %mvn_artifact pom-jna-platform.xml contrib/platform/dist/jna-platform.jar
 
-%mvn_install -J doc/javadoc
+%mvn_install
 
 %files -f .mfiles
 %doc OTHERS README.md CHANGES.md TODO
 %license LICENSE LGPL2.1 AL2.0
 %{_libdir}/%{name}
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE LGPL2.1 AL2.0
-
 %files contrib -f .mfiles-contrib
 
 %changelog

From f4f2c93a14eec9f01575099b0397d71999fd6765 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 4 Jun 2025 14:31:07 +0200
Subject: [PATCH 3/7] Update to upstream version 5.17.0

---
 .gitignore                   |  1 +
 0004-Fix-javadoc-build.patch | 10 +++++-----
 generate-tarball.sh          | 12 +++++-------
 jna.spec                     | 14 ++++++++------
 sources                      |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 988bc06..9d587c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ jna-3.2.7.tar.bz2
 /jna-5.13.0-clean.tar.xz
 /jna-5.14.0-clean.tar.xz
 /jna-5.15.0-clean.tar.xz
+/jna-5.17.0.tar.zst
diff --git a/0004-Fix-javadoc-build.patch b/0004-Fix-javadoc-build.patch
index dc5ab54..b2bc537 100644
--- a/0004-Fix-javadoc-build.patch
+++ b/0004-Fix-javadoc-build.patch
@@ -8,17 +8,17 @@ Subject: [PATCH 4/6] Fix javadoc build
  1 file changed, 1 insertion(+)
 
 diff --git a/build.xml b/build.xml
-index 835c02b..cecafd0 100644
+index 8f5733a..fb8d544 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -1307,6 +1307,7 @@ cd ..
+@@ -1343,6 +1343,7 @@ cd ..
        <group title="Platform Specific" packages="com.sun.jna.platform.*"/>
  
        <arg value="-notimestamp"/>
 +      <arg value="--allow-script-in-comments"/>
      </javadoc>
-     <jar jarfile="${platform-javadoc-jar}" createUnicodeExtraFields="never" encoding="UTF-8">
-       <fileset dir="${javadoc}" />
+     <!--
+     Create an empty resources/fonts/dejavu.css - the file is reference by default
 -- 
-2.20.1
+2.49.0
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 511bc4d..f8557cd 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 set -e
 
-version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+version=$(grep Version: *.spec | sed -e 's/Version:\s*\(.*\)/\1/')
 
-
-wget https://github.com/java-native-access/jna/archive/${version}.tar.gz -O jna-${version}.tar.gz
+curl -L https://github.com/java-native-access/jna/archive/${version}.tar.gz -o jna-${version}.tar.gz
 rm -rf jna-${version}
 tar xf jna-${version}.tar.gz
 #mv twall-jna-* jna-${version}
@@ -15,14 +14,13 @@ rm -rvf jna-${version}/{dist/*,www,native/libffi}
 # effect on resulting jar. One jar (depending on architecture) will
 # be replaced with full content (containing libjnidispatch.so)
 for njar in jna-${version}/lib/native/*.jar; do
-    rm -v $njar
+    rm -v ${njar}
     touch empty
-    jar cf $njar empty
+    jar -cf ${njar} empty
     rm -f empty
 done
 
 find jna-${version} -iname '*jar' -size +1b -delete
 find jna-${version} -name '*.class' -delete
 
-tar cf jna-${version}-clean.tar jna-${version}
-xz -9 jna-${version}-clean.tar
+tar -c jna-${version} | zstd -10 -f -o "jna-${version}.tar.zst"
diff --git a/jna.spec b/jna.spec
index b04b40e..c4a4f38 100644
--- a/jna.spec
+++ b/jna.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name:           jna
-Version:        5.15.0
+Version:        5.17.0
 Release:        %autorelease
 Summary:        Pure Java access to native libraries
 # Most of code is dual-licensed under either LGPL 2.1+ only or Apache
@@ -16,7 +16,7 @@ License:        Apache-2.0 OR LGPL-2.1-or-later
 
 URL:            https://github.com/java-native-access/jna/
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}-clean.tar.xz
+Source0:        %{name}-%{version}.tar.zst
 Source1:        package-list
 Source2:        generate-tarball.sh
 
@@ -88,10 +88,12 @@ sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java
 
 # TEMPLATE has to be changed to %%version in the pom files
 # in order to generate correct provides
-sed -i 's/TEMPLATE/%{version}/' pom-jna-jpms.xml \
-				pom-jna-platform.xml \
-				pom-jna.xml \
-				pom-jna-platform-jpms.xml
+sed -i 's/TEMPLATE/%{version}/' \
+ pom-jna-jpms.xml \
+ pom-jna-platform.xml \
+ pom-jna.xml \
+ pom-jna-platform-jpms.xml \
+;
 
 # clean LICENSE.txt
 sed -i 's/\r//' LICENSE
diff --git a/sources b/sources
index 706645c..1c248d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jna-5.15.0-clean.tar.xz) = 321586504c7ae1769334bd73c4415c6b94bf2f3b56f269d21bb5e6aa0f2aebe32a3b1ac201531d0a033ba51b99d5fede3a4defd92c60c62d871d4781200f7a19
+SHA512 (jna-5.17.0.tar.zst) = 7e611377d6f91e68ce6939e5a544ad6efe4c069c1cd5b1c18aee0e21679fecebce82ab9fb20d904d7dc6b92122c734f518b346a51b296ac8475f407541ac0a9a

From d6b7eccc62280dd15ba5e684aae45453d0c7d4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Sat, 12 Jul 2025 11:40:40 +0000
Subject: [PATCH 4/7] Migrate to SPDX license

This line was not coverted to SPDX. After conversion it would be the same as license of the main package. And therefore it is redundant and can be removed.
---
 jna.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jna.spec b/jna.spec
index c4a4f38..c298e13 100644
--- a/jna.spec
+++ b/jna.spec
@@ -72,7 +72,6 @@ of use take priority.
 
 %package        contrib
 Summary:        Contrib for %{name}
-License:        LGPLv2+ or ASL 2.0
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 

From 15fda0c0f6982b40a4de05548ddc0d5af9da6d7a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 13 Jul 2025 09:22:51 +0200
Subject: [PATCH 5/7] Build with OpenJDK 25

---
 jna.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jna.spec b/jna.spec
index c298e13..5901d64 100644
--- a/jna.spec
+++ b/jna.spec
@@ -46,7 +46,7 @@ ExclusiveArch:  %{java_arches}
 Requires:       libffi
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local-openjdk25
 BuildRequires:  libffi-devel
 BuildRequires:  ant
 BuildRequires:  ant-junit

From 4b6d478af76f5eb50a993a0f3d2f2cb04bc5e273 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 18:02:59 +0000
Subject: [PATCH 6/7] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 25d8c8d03d4c042fc69ada35ad3f71e990f3f2dd Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 29 Jul 2025 23:54:56 +0200
Subject: [PATCH 7/7] Rebuilt for java-25-openjdk as preffered jdk

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
---
 jna.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jna.spec b/jna.spec
index 5901d64..c20e024 100644
--- a/jna.spec
+++ b/jna.spec
@@ -48,7 +48,7 @@ BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  javapackages-local-openjdk25
 BuildRequires:  libffi-devel
-BuildRequires:  ant
+BuildRequires:  ant-openjdk25 
 BuildRequires:  ant-junit
 BuildRequires:  junit
 BuildRequires:  libX11-devel