Accepting request 1290129 from Java:packages

OBS-URL: https://build.opensuse.org/request/show/1290129
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jna?expand=0&rev=9

jna-no-multirelease.patch

@@ -0,0 +1,42 @@
+--- jna-5.13.0/build.xml	2025-07-03 09:09:11.117850701 +0200
++++ jna-5.13.0/build.xml	2025-07-03 09:14:19.243369605 +0200
+@@ -492,9 +492,6 @@
+                  which will force failure on unsupported platforms.
+               -->
+           </manifest>
+-          <manifest file="@{target}" mode="update" if:true="@{module-info}">
+-              <attribute name="Multi-Release" value="true"/>
+-          </manifest>
+           <manifest file="@{target}" mode="update" unless:true="@{module-info}">
+               <attribute name="Automatic-Module-Name" value="com.sun.jna"/>
+           </manifest>
+@@ -527,7 +524,7 @@
+     </zip>
+     <jar jarfile="${build}/jna-jpms.jar" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8" manifest="${build}/manifest/module.mf">
+       <zipfileset src="${build}/${jar}" excludes="META-INF/MANIFEST.mf"/>
+-      <zipfileset dir="${build}/manifest/" includes="module-info.class" prefix="META-INF/versions/9"/>
++      <zipfileset dir="${build}/manifest/" includes="module-info.class"/>
+     </jar>
+   </target>
+ 
+--- jna-5.13.0/contrib/platform/build.xml	2025-07-03 09:09:11.125026335 +0200
++++ jna-5.13.0/contrib/platform/build.xml	2025-07-03 09:33:54.156634730 +0200
+@@ -169,9 +169,6 @@
+ com.sun.jna.platform.wince;version=&quot;${osgi.version}&quot;;uses:=&quot;com.sun.jna,com.sun.jna.platform.win32&quot;
+ "/>
+             </manifest>
+-            <manifest file="@{target}" mode="update" if:true="@{module-info}">
+-                <attribute name="Multi-Release" value="true"/>
+-            </manifest>
+             <manifest file="@{target}" mode="update" unless:true="@{module-info}">
+                 <attribute name="Automatic-Module-Name" value="com.sun.jna.platform"/>
+             </manifest>
+@@ -222,7 +219,7 @@
+         </jar>
+         <jar jarfile="dist/jna-platform-jpms.jar" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8" manifest="${build.dir}/manifest/module.mf">
+             <zipfileset src="${build.dir}/jna-platform-base.jar" excludes="META-INF/MANIFEST.mf"/>
+-            <zipfileset dir="${build.dir}/manifest/" includes="module-info.class" prefix="META-INF/versions/9"/>
++            <zipfileset dir="${build.dir}/manifest/" includes="module-info.class"/>
+         </jar>
+     </target>
+ 

jna.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul  3 07:38:29 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * jna-no-multirelease.patch
+    + do not put module-info.class in multirelease directories
+
 -------------------------------------------------------------------
 Mon Apr 29 12:36:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

jna.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jna
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -33,7 +33,8 @@ Patch0:         jna-build.patch
 Patch1:         jna-callback.patch
 Patch2:         jna-system-libjnidispatch.patch
 Patch3:         jna-java8compat.patch
-Patch4:         jna-old-libffi.patch
+Patch4:         jna-no-multirelease.patch
+Patch5:         jna-old-libffi.patch
 BuildRequires:  ant
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -85,9 +86,10 @@ This package contains the javadocs for %{name}.
 %patch -P 1 -p1
 %patch -P 2 -p1
 %patch -P 3 -p1
+%patch -P 4 -p1
 
 %if 0%{?suse_version} < 1550
-%patch -P 4 -p1
+%patch -P 5 -p1
 %endif
 
 sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java