File _service:obs_scm:sigar-1.6.5-java_build.patch of Package sigar

diff -Nru sigar-1.6.5/bindings/java/build.xml sigar-1.6.5-gil/bindings/java/build.xml
--- sigar-1.6.5/bindings/java/build.xml	2011-04-21 20:38:36.000000000 +0200
+++ sigar-1.6.5-gil/bindings/java/build.xml	2012-12-05 09:11:27.360092658 +0100
@@ -22,7 +22,7 @@
   <property name="jni.info.res" location="build/src/sigar.res"/>
   <property name="jni.libprefix" value=""/> 
   <property name="cpptasks.jar"
-            location="hyperic_jni/lib/cpptasks.jar"/>
+	    location="/usr/share/java/ant/cpptasks.jar"/>
 
   <condition property="file.version" value="-${sigar.version}">
     <isset property="file.versioned"/>
@@ -50,13 +50,15 @@
   <property name="sigar.fqdn" value=""/>
 
   <path id="libjars">
-     <fileset dir="lib" includes="*.jar"/>
+     <fileset dir="/usr/share/java" includes="ant/cpptasks.jar"/>
+     <fileset dir="/usr/share/java" includes="mx4j/mx4j-jmx.jar"/>
+     <fileset dir="/usr/share/java" includes="log4j.jar"/>
   </path>
 
   <path id="alljars">
      <path refid="libjars"/>
      <fileset dir="${sigar-bin}/lib" includes="${sigar.jar}"/>
-     <fileset dir="${ant.library.dir}" includes="junit*.jar"/>
+     <fileset dir="/usr/share/java" includes="junit.jar"/>
   </path>
 
   <target name="javadoc_check">
@@ -85,7 +87,7 @@
              doctitle="Sigar">
       <group title="Sigar" packages="org.hyperic.sigar" />
       <classpath refid="libjars"/>
-      <classpath><path path="${ant.library.dir}/ant.jar"/></classpath>
+      <classpath><path path="/usr/share/java/ant.jar"/></classpath>
      <bottom>Copyright &#169; ${copyright.year} <![CDATA[<a target="_top" href="http://www.hyperic.com/">Hyperic</a>]]>. All Rights Reserved.</bottom>
     </javadoc>
   </target>
@@ -96,7 +98,7 @@
       <classpath refid="alljars"/>
     </available>
     <javac destdir="${build}/classes"
-           source="1.4" target="1.4"
+           source="1.5" target="1.5"
            sourcepath=""
            debug="true"
            classpathref="libjars">
diff -Nru sigar-1.6.5/bindings/java/hyperic_jni/jni-build.xml sigar-1.6.5-gil/bindings/java/hyperic_jni/jni-build.xml
--- sigar-1.6.5/bindings/java/hyperic_jni/jni-build.xml	2011-04-21 20:38:36.000000000 +0200
+++ sigar-1.6.5-gil/bindings/java/hyperic_jni/jni-build.xml	2012-12-05 09:15:11.564529239 +0100
@@ -28,7 +28,7 @@
   <property name="jni.libprefix" value="java"/>
   <property name="jni.libversion" value=""/>
 
-  <property name="cpptasks.jar" location="lib/cpptasks.jar"/>
+  <property name="cpptasks.jar" location="/usr/share/java/cpptasks.jar"/>
 
   <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask">
     <classpath location="${cpptasks.jar}"/>
@@ -60,7 +60,7 @@
     <condition property="linux">
       <equals arg1="${os.name}" arg2="Linux"/>
     </condition>
-    <condition property="solaris">
+    
 
     <condition property="jni.os" value="linux">
       <isset property="linux"/>
     </condition>
 
-    <condition property="jni.os" value="win32">
+    
 
     
-    <condition property="jni.src" value="darwin">
+    
 
     <condition property="jni.jdk.os" value="${jni.os}">
       <and>
@@ -146,13 +146,13 @@
       </and>
     </condition>
 
-    <condition property="jni.jdk.os" value="hp-ux">
+    
 
     <condition property="jni.src" value="${jni.os}">
       <isfalse value="${jni.src}"/>
@@ -161,7 +161,7 @@
     <echo message="jni.src=${jni.src}, jni.jdk.os=${jni.jdk.os}, ${sun.arch.data.model}-bit"/>
 
     <javac srcdir="${jni.src.java}" destdir="${build}/classes" debug="true"
-           source="1.4" target="1.4"
+           source="1.5" target="1.5"
 	   includes="org/hyperic/jni/*.java"/>
 
     <taskdef name="libarch" classname="org.hyperic.jni.ArchNameTask">
@@ -190,9 +190,9 @@
 
     <property name="jni.objdir" value="${build}/obj/${jni.libarch}"/>
 
-    <condition property="jni.cc" value="uni-cc">
+    
 
     <property name="jni.cc" value="jni-cc"/>
 
@@ -225,19 +225,19 @@
   </target>
 
   
-  <target name="uni-cc" if="jni.libarch">
-    <property name="shlib" value="${jni.objdir}/lib/lib${jni.libname}.dylib"/>
+  
 
     
-    <echo message="build 'ppc' arch"/>
+    
 
     
-    <echo message="build 'i386' arch"/>
+    
 
   <target name="jni-cc" if="jni.libarch">
     <mkdir dir="${jni.objdir}/lib"/>
@@ -270,7 +270,7 @@
 	relentless="false">
 
       
-      <compiler name="hp"  if="hpux">
+      
 
       
-      <compiler name="gcc" if="solaris">
+      
 
-      <linker name="gcc" if="solaris">
+      
         
         
-        <linkerarg value="-static-libgcc"/>
+        
 
       
       <compiler name="gcc" debug="${jni.debug}" if="linux">
@@ -344,7 +344,7 @@
       </linker>
 
       
-      <compiler name="gcc" if="darwin">
+      
 
         
-        <linkerarg value="-framework"/>
+        
 
       
-      <compiler name="gcc" if="freebsd">
+      
 
       
-      <compiler name="gcc" if="openbsd">
+      
         
-        <defineset>
+        
 
       
-      <compiler name="gcc" if="netbsd">
+      
         
-        <defineset>
+        
 
       
-      <compiler name="xlc_r" if="aix">
+      
 
       
-      <linker name="msvc" debug="${jni.debug}" if="win32">
+      
           
-          <define name="SIGAR_NO_ATL" if="jni.noatl"/>
+          
 
       
-      <compiler name="gcc" if="osf1">
+      
 
       
       <fileset dir="${jni.source.dir}">