rpms/jogl/devel jogl-ModularX.patch,NONE,1.1 jogl.spec,1.11,1.12

[Anthony Green (green)]

Author: green

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

Modified Files:
	jogl.spec 
Added Files:
	jogl-ModularX.patch 
Log Message:
Add patch3.


jogl-ModularX.patch:

--- NEW FILE jogl-ModularX.patch ---
--- make/build.xml~	2005-11-19 11:10:06.000000000 -0800
+++ make/build.xml	2005-11-19 15:10:52.000000000 -0800
@@ -750,12 +750,12 @@
       <!-- linker configuration -->
  
       <linker id="linker.cfg.linux" name="gcc">
-        <syslibset dir="/usr/X11R6/lib" libs="GL, GLU, X11"/>
+        <syslibset libs="GL, GLU, X11"/>
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 
       <linker id="linker.cfg.linux.amd64" name="gcc">
-        <syslibset dir="/usr/X11R6/lib64" libs="GL, GLU, X11"/>
+        <syslibset libs="GL, GLU, X11"/>
         <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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jogl.spec	19 Nov 2005 22:41:06 -0000	1.11
+++ jogl.spec	19 Nov 2005 23:42:50 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           jogl
 Version:        1.1.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Java bindings for the OpenGL API
 
 Group:          System Environment/Libraries
@@ -15,6 +15,7 @@
 Patch0:		jogl-ppc.patch
 Patch1:		jogl-nojavadoclink.patch
 Patch2:		jogl-ppctools.patch
+Patch3:		jogl-ModularX.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, antlr, ant-antlr, jpackage-utils >= 1.5
@@ -46,6 +47,7 @@
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 cp %{SOURCE3} .
@@ -105,6 +107,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Nov 19 2005 Anthony Green <green at redhat.com> - 0:1.1.1-11
+- Add Patch3 for X change.
+
 * Sat Nov 19 2005 Anthony Green <green at redhat.com> - 0:1.1.1-10
 - Update BuildRequires for modular X.
 - Add some Requires.