From cf5da997da8820b4050f5b87ee9440a0ede36d1f Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Thu, 2 Mar 2017 00:23:36 +0100
Subject: Strip native code not matching the installer platform

Follow-up to bc3f0942854004a228ecb8aa7678496ec0b3e14e
---
 resources/install/build.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 98202f8..fa8e3d5 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -580,6 +580,10 @@
             <param name="platform" value="windows-${windows.arch}" />
         </antcall>
         <antcall target="strip-multi-platform-jar">
+            <param name="jar" value="${light.dir}/sc-bundles/jitsi-gpl-dependencies.jar"/>
+            <param name="platform" value="windows-${windows.arch}" />
+        </antcall>
+        <antcall target="strip-multi-platform-jar">
             <param name="jar" value="${light.dir}/sc-bundles/jitsi-lgpl-dependencies.jar"/>
             <param name="platform" value="windows-${windows.arch}" />
         </antcall>
@@ -1200,6 +1204,10 @@
           <param name="platform" value="osx" />
       </antcall>
       <antcall target="strip-multi-platform-jar">
+          <param name="jar" value="${bundles.dest}/jitsi-gpl-dependencies.jar"/>
+          <param name="platform" value="osx" />
+      </antcall>
+      <antcall target="strip-multi-platform-jar">
           <param name="jar" value="${bundles.dest}/jitsi-lgpl-dependencies.jar"/>
           <param name="platform" value="osx" />
       </antcall>
@@ -3243,6 +3251,10 @@
         <symlink resource="/usr/share/libjitsi/lib/ice4j.jar"
              overwrite="true"
              link="${debian.src.dir}/lib/installer-exclude"/>
+        <!-- jitsi-gpl-dependencies -->
+        <symlink resource="/usr/share/libjitsi/lib/jitsi-gpl-dependencies.jar"
+             overwrite="true"
+             link="${debian.src.dir}/lib/installer-exclude/"/>
         <!-- jitsi-lgpl-dependencies -->
         <symlink resource="/usr/share/libjitsi/lib/jitsi-lgpl-dependencies.jar"
              overwrite="true"
@@ -3763,6 +3775,8 @@
                  link="${debian.bundles.common.dest}/libjitsi.jar/"/>
         <symlink resource="/usr/share/libjitsi/libjitsi.jar"
                  link="${debian.bundles.common.dest}/libjitsi.jar/"/>
+        <symlink resource="/usr/share/libjitsi/lib/jitsi-gpl-dependencies.jar"
+                 link="${debian.bundles.common.dest}/libjitsi.jar/"/>
         <symlink resource="/usr/share/libjitsi/lib/jitsi-lgpl-dependencies.jar"
                  link="${debian.bundles.common.dest}/libjitsi.jar/"/>
         <symlink resource="/usr/share/libjitsi/lib/fmj.jar"
@@ -3789,7 +3803,7 @@
             destfile="${debian.bundles.common.dest}/libjitsi.jar/META-INF/MANIFEST.MF"
             append="true"
             eol="crlf"
-            fixlastline="true">Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,jitsi-lgpl-dependencies.jar,libjitsi.jar,bcpkix.jar&#013;&#010;&#013;&#010;</concat>
+            fixlastline="true">Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,jitsi-gpl-dependencies.jar,jitsi-lgpl-dependencies.jar,libjitsi.jar,bcpkix.jar&#013;&#010;&#013;&#010;</concat>
         <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
                  token="reference:file:sc-bundles/libjitsi.jar">
             <replacevalue>reference:file:/usr/share/jitsi-common/libjitsi.jar</replacevalue>
-- 
cgit v1.1