rpms/jogl/devel jogl-xlibs.patch, NONE, 1.1 jogl.spec, 1.19, 1.20 jogl-ModularX.patch, 1.1, NONE

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/jogl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18072

Modified Files:
	jogl.spec 
Added Files:
	jogl-xlibs.patch 
Removed Files:
	jogl-ModularX.patch 
Log Message:
Increment revision.  add patch.


jogl-xlibs.patch:

--- NEW FILE jogl-xlibs.patch ---
--- jogl/make/build.xml~	2006-07-30 13:32:21.000000000 -0700
+++ jogl/make/build.xml	2006-07-30 17:27:03.000000000 -0700
@@ -826,22 +826,22 @@
       <!-- linker configuration -->
  
       <linker id="linker.cfg.linux" name="gcc">
-        <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/>
-        <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" />
+        <syslibset libs="GL, X11"/>
+        <syslibset libs="Xxf86vm" />
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 
       <linker id="linker.cfg.linux.drihack" name="gcc" />
 
       <linker id="linker.cfg.linux.amd64" name="gcc">
-        <syslibset dir="/usr/X11R6/lib64" libs="GL, X11"/>
-        <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" />
+        <syslibset libs="GL, X11"/>
+        <syslibset libs="Xxf86vm" />
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 
       <linker id="linker.cfg.linux.ppc" name="gcc">
-        <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/>
-        <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" />
+        <syslibset libs="GL, X11"/>
+        <syslibset libs="Xxf86vm" />
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 


Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jogl.spec	31 Jul 2006 00:29:40 -0000	1.19
+++ jogl.spec	31 Jul 2006 00:50:36 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           jogl
 Version:        1.0.0
-Release:        3.0.beta5%{?dist}
+Release:        4.0.beta5%{?dist}
 Summary:        Java bindings for the OpenGL API
 Epoch:          1
 
@@ -108,7 +108,7 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
-* Sun Jul 30 2006 Anthony Green <green at redhat.com> - 1:1.0.0-3.0.beta5
+* Sun Jul 30 2006 Anthony Green <green at redhat.com> - 1:1.0.0-4.0.beta5
 - Fix X library directory references.
 
 * Sun Jul 30 2006 Anthony Green <green at redhat.com> - 1:1.0.0-2.0.beta5


--- jogl-ModularX.patch DELETED ---