jna/0005-Fix-duplicate-manifest-entry.patch
Mikolaj Izdebski 156aa11664 Fix compatibility with Java 8
Resolves: rhbz#2162040
2023-01-26 08:19:26 +00:00

29 lines
857 B
Diff

From c86b3417e9588cdbb43d7034e16a22d4b815ce95 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 10 Jul 2017 11:48:43 +0200
Subject: [PATCH 5/7] Fix duplicate manifest entry
---
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 741ab6e..54e569c 100644
--- a/build.xml
+++ b/build.xml
@@ -611,9 +611,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
includes="LICENSE,LGPL2.1,AL2.0"
prefix="META-INF"/>
</jar>
- <zip zipfile="${build}/${minjar}">
+ <jar zipfile="${build}/${minjar}" filesetmanifest="merge">
<zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
- </zip>
+ </jar>
</target>
<target name="aar" depends="jar" description="Build Android Archive">
--
2.38.1