rpms/jogl/devel jogl-nojavadoclink.patch, NONE, 1.1 jogl.spec, 1.5, 1.6

Anthony Green (green) fedora-extras-commits at redhat.com
Sat Sep 3 19:36:44 UTC 2005


Author: green

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

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


jogl-nojavadoclink.patch:

--- NEW FILE jogl-nojavadoclink.patch ---
--- make/build.xml~	2005-05-13 16:35:36.000000000 -0700
+++ make/build.xml	2005-09-03 12:32:23.000000000 -0700
@@ -928,8 +928,7 @@
         <javadoc packagenames="${javadoc.packagenames}"
                  sourcepath="${src};${src.generated.java}"        
                  destdir="${javadoc}" windowtitle="JOGL API"
-                 source="1.4"
-                 link="${javadoc.link}" />
+                 source="1.4" />
     </target>
 
     <!-- Same as above but with Cg directories added -->
@@ -938,8 +937,7 @@
         <javadoc packagenames="${javadoc.packagenames},net.java.games.cg"
                  sourcepath="${src};${src.generated.java}"        
                  destdir="${javadoc}" windowtitle="JOGL API"
-                 source="1.4"
-                 link="${javadoc.link}" />
+                 source="1.4" />
     </target>
 
     <target name="javadoc" depends="javadoc.nocg,javadoc.cg" />
@@ -949,8 +947,7 @@
         <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform}"
                  sourcepath="${src};${src.generated.java}"        
                  destdir="${javadoc.dev}" windowtitle="JOGL API"
-                 source="1.4"
-                 link="${javadoc.link}" />
+                 source="1.4" />
     </target>
 
     <!-- Same as above but with Cg directories added -->
@@ -959,8 +956,7 @@
         <javadoc packagenames="${javadoc.dev.packagenames},${javadoc.dev.packagenames.platform},net.java.games.cg"
                  sourcepath="${src};${src.generated.java}"        
                  destdir="${javadoc.dev}" windowtitle="JOGL API"
-                 source="1.4"
-                 link="${javadoc.link}" />
+                 source="1.4" />
     </target>
 
     <target name="javadoc.dev.win32"  depends="setup.java.home.dir,declare.win32,javadoc.dev.nocg,javadoc.dev.cg" />


Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jogl.spec	3 Sep 2005 18:55:27 -0000	1.5
+++ jogl.spec	3 Sep 2005 19:36:42 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           jogl
 Version:        1.1.1
-Release:        4
+Release:        5
 Epoch:          0
 Summary:        Java bindings for the OpenGL API
 
@@ -12,6 +12,7 @@
 Source2:        SGIFreeSWLicB.1.1.ps
 Source3:        jogl-README.txt
 Patch0:		jogl-ppc.patch
+Patch1:		jogl-nojavadoclink.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, antlr, ant-antlr, jpackage-utils >= 0:1.5
@@ -40,6 +41,7 @@
 %prep
 %setup -q -n jogl
 %patch0 -p0
+%patch1 -p0
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 cp %{SOURCE3} .
@@ -97,6 +99,10 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Sep  3 2005 Anthony Green <green at redhat.com> - 0:1.1.1-5
+- Add nojavadoclink patch so we don't end up referencing Sun's
+  javadocs.
+
 * Sat Sep  3 2005 Anthony Green <green at redhat.com> - 0:1.1.1-4
 - Add ppc build patch.
 




More information about the fedora-extras-commits mailing list