File gluegen2-jar-paths.patch of Package gluegen2

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index 93d9743..5603685 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -20,7 +20,7 @@
 
   <!-- import cpptasks -->
   <!--typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/-->
-  <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/>
+  <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="/usr/share/java/cpptasks.jar"/>
 
   <!-- 0 fetch environment variable GLUEGEN_CPPTASKS_FILE -> gluegen-cpptasks.file -->
   <property environment="env" />
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 7efc4c1..20a921a 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -46,10 +46,10 @@
     <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
     <property file="${gluegen.user.properties.file.set}" />
     <echo message="Loaded ${gluegen.user.properties.file.set}." />
-    <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
-    <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
-    <property name="ant.jar"       value="${ant.home}/lib/ant.jar" />
-    <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
+    <property name="antlr.jar" value="/usr/share/java/antlr.jar" />
+    <property name="junit.jar" value="/usr/share/java/junit4.jar" />
+    <property name="ant.jar"       value="/usr/share/java/ant.jar" />
+    <property name="ant-junit.jar" value="/usr/share/java/ant/ant-junit.jar" />
 
     <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
     <property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" />
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml
index 30d8dc0..15c0c06 100644
--- a/make/jogamp-androidtasks.xml
+++ b/make/jogamp-androidtasks.xml
@@ -3,7 +3,7 @@
     <dirname property="jogamp-androidtasks.basedir" file="${ant.file.jogamp-androidtasks}"/>
     <taskdef resource="net/sf/antcontrib/antlib.xml">
       <classpath> 
-        <pathelement location="${jogamp-androidtasks.basedir}/lib/ant-contrib-1.0b3.jar"/> 
+        <pathelement location="/usr/share/java/ant-contrib.jar"/> 
       </classpath>
     </taskdef>
 
diff --git a/make/jogamp-archivetasks.xml b/make/jogamp-archivetasks.xml
index 24309d8..fb826a3 100644
--- a/make/jogamp-archivetasks.xml
+++ b/make/jogamp-archivetasks.xml
@@ -3,7 +3,7 @@
     <dirname property="jogamp-archivetasks.basedir" file="${ant.file.jogamp-archivetasks}"/>
     <taskdef resource="net/sf/antcontrib/antlib.xml">
       <classpath> 
-        <pathelement location="${jogamp-archivetasks.basedir}/lib/ant-contrib-1.0b3.jar"/> 
+        <pathelement location="/usr/share/java/ant-contrib.jar"/>
       </classpath>
     </taskdef>
 
openSUSE Build Service is sponsored by