rpms/jna/devel jna-3.0.4-nomixedjar.patch,NONE,1.1

[Colin Walters (walters)]

Author: walters

Update of /cvs/pkgs/rpms/jna/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25875

Added Files:
	jna-3.0.4-nomixedjar.patch 
Log Message:
add patch

jna-3.0.4-nomixedjar.patch:

--- NEW FILE jna-3.0.4-nomixedjar.patch ---
diff -ur jna-3.0.4.orig/build.xml jna-3.0.4-svn630/build.xml
--- jna-3.0.4.orig/build.xml	2008-07-31 13:44:34.000000000 -0400
+++ jna-3.0.4-svn630/build.xml	2008-07-31 14:08:58.000000000 -0400
@@ -348,17 +348,7 @@
       <arg value="VERSION=${jni.version}"/>
       <arg value="CHECKSUM=${jni.md5}"/>
     </exec>
-    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${classes}/com/sun/jna/${os.prefix}">
-      <fileset dir="${build.native}" 
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
-          failonerror="false">
-      <fileset dir="${build.native}" 
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
+    <antcall target="copy-native"/>
     <!-- For web start, native libraries may be provided in the root of -->
     <!-- an included jar file -->
     <jar jarfile="${build}/${native.jar}">
@@ -369,6 +359,20 @@
       </manifest>
     </jar>
   </target>
+  
+  <target name="copy-native" unless="nomixedjar.native">
+    <mkdir dir="${classes}/com/sun/jna/${os.prefix}" unless="nomixedjar.native"/>
+    <copy todir="${classes}/com/sun/jna/${os.prefix}" unless="nomixedjar.native">
+      <fileset dir="${build.native}" 
+               includes="jnidispatch.dll,libjnidispatch.*"/>
+    </copy>
+    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
+    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
+          failonerror="false">
+      <fileset dir="${build.native}" 
+               includes="jnidispatch.dll,libjnidispatch.*"/>
+    </copy>
+  </target>
 
   <target name="compile-tests" depends="compile,native"
           description="Compile all test code">