Blame SOURCES/0005-Fix-duplicate-manifest-entry.patch

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