.gitignore

@@ -23,4 +23,3 @@ 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

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 8f5733a..fb8d544 100644
+index 835c02b..cecafd0 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -1343,6 +1343,7 @@ cd ..
+@@ -1307,6 +1307,7 @@ cd ..
        <group title="Platform Specific" packages="com.sun.jna.platform.*"/>
  
        <arg value="-notimestamp"/>
 +      <arg value="--allow-script-in-comments"/>
      </javadoc>
-     <!--
-     Create an empty resources/fonts/dejavu.css - the file is reference by default
+     <jar jarfile="${platform-javadoc-jar}" createUnicodeExtraFields="never" encoding="UTF-8">
+       <fileset dir="${javadoc}" />
 -- 
-2.49.0
+2.20.1
 

generate-tarball.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 set -e
 
-version=$(grep Version: *.spec | sed -e 's/Version:\s*\(.*\)/\1/')
+version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
 
-curl -L https://github.com/java-native-access/jna/archive/${version}.tar.gz -o jna-${version}.tar.gz
+
+wget 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}
@@ -14,13 +15,14 @@ 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 -c jna-${version} | zstd -10 -f -o "jna-${version}.tar.zst"
+tar cf jna-${version}-clean.tar jna-${version}
+xz -9 jna-${version}-clean.tar

jna.spec

@@ -6,7 +6,7 @@
 %endif
 
 Name:           jna
-Version:        5.17.0
+Version:        5.15.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}.tar.zst
+Source0:        %{name}-%{version}-clean.tar.xz
 Source1:        package-list
 Source2:        generate-tarball.sh
 
@@ -46,9 +46,9 @@ ExclusiveArch:  %{java_arches}
 Requires:       libffi
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  javapackages-local-openjdk25
+BuildRequires:  javapackages-local
 BuildRequires:  libffi-devel
-BuildRequires:  ant-openjdk25 
+BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  junit
 BuildRequires:  libX11-devel
@@ -59,9 +59,6 @@ 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
@@ -70,8 +67,16 @@ 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
 Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
@@ -87,12 +92,10 @@ 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
@@ -139,13 +142,16 @@ 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
+%mvn_install -J doc/javadoc
 
 %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

plans/javapackages.fmf

@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  url: https://src.fedoraproject.org/tests/javapackages
   ref: main
 execute:
   how: tmt

sources

@@ -1 +1 @@
-SHA512 (jna-5.17.0.tar.zst) = 7e611377d6f91e68ce6939e5a544ad6efe4c069c1cd5b1c18aee0e21679fecebce82ab9fb20d904d7dc6b92122c734f518b346a51b296ac8475f407541ac0a9a
+SHA512 (jna-5.15.0-clean.tar.xz) = 321586504c7ae1769334bd73c4415c6b94bf2f3b56f269d21bb5e6aa0f2aebe32a3b1ac201531d0a033ba51b99d5fede3a4defd92c60c62d871d4781200f7a19