rpms/jogl/devel jogl-ppctools.patch,NONE,1.1 jogl.spec,1.6,1.7

[Anthony Green (green)]

Author: green

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

Modified Files:
	jogl.spec 
Added Files:
	jogl-ppctools.patch 
Log Message:
ppc build fixes.  only build for x86 and ppc for now.  remove epoch:0.


jogl-ppctools.patch:

--- NEW FILE jogl-ppctools.patch ---
*** make/build.xml.old	2005-09-03 13:17:38.000000000 -0700
--- make/build.xml	2005-09-03 13:17:46.000000000 -0700
***************
*** 202,207 ****
--- 202,208 ----
          <property name="java.includes.dir.freebsd" value="${java.includes.dir}/freebsd" />
          <property name="java.lib.dir.win32" value="${java.home.dir}/lib" />
          <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />
+         <property name="java.lib.dir.linux.ppc" value="${java.home.dir}/jre/lib/ppc" />
          <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" />
          <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" />
  	<condition property="cpu" value="sparc">
***************
*** 315,320 ****
--- 316,329 ----
          <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
      </target>
      
+     <target name="declare.linux.ppc" depends="declare.x11">
+         <property name="java.includes.dir.platform"           value="${java.includes.dir.linux}" />
+         <property name="java.lib.dir.platform"                value="${java.lib.dir.linux.ppc}" />       
+ 
+         <property name="compiler.cfg.id"                      value="compiler.cfg.linux.ppc" /> 
+         <property name="linker.cfg.id"                        value="linker.cfg.linux" /> 
+     </target>
+     
      <target name="declare.linux.amd64" depends="declare.x11">
          <property name="java.includes.dir.platform"           value="${java.includes.dir.linux}" />
          <property name="java.lib.dir.platform"                value="${java.lib.dir.linux.amd64}" />       
***************
*** 684,689 ****
--- 693,702 ----
          <compilerarg value="-fPIC"/>
        </compiler>
  
+       <compiler id="compiler.cfg.linux.ppc" name="gcc">
+         <compilerarg value="-fPIC"/>
+       </compiler>
+ 
        <compiler id="compiler.cfg.solaris" name="suncc">
        </compiler>
  
***************
*** 885,890 ****
--- 898,906 ----
      <target name="c.compile.jogl.linux" depends="declare.linux, c.build.jogl, c.build.cg" >
      </target>
      
+     <target name="c.compile.jogl.linux.ppc" depends="declare.linux.ppc, c.build.jogl, c.build.cg" >
+     </target>
+     
      <target name="c.compile.jogl.linux.amd64" depends="declare.linux.amd64, c.build.jogl, c.build.cg" >
      </target>
      
*************** Use a platform specific target:  linux, 
*** 1093,1098 ****
--- 1109,1125 ----
      </target>
  
      <!--
+        - Linux on PPC (assuming GCC)
+       -->
+     <target name="linux.ppc" depends="declare.linux.ppc">
+         <!-- Generate, compile, and build the jar for the Java sources. -->
+         <antcall target="jar" inheritRefs="true" />
+ 
+         <!-- Compile the native C sources and build the jogl lib. -->
+         <antcall target="c.compile.jogl.linux.ppc" />
+     </target>
+ 
+     <!--
         - Linux on AMD64 (assuming GCC)
        -->
      <target name="linux.amd64" depends="setup.java.home.dir.nonmacosx, declare.linux.amd64">


Index: jogl.spec
===================================================================
RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jogl.spec	3 Sep 2005 19:36:42 -0000	1.6
+++ jogl.spec	3 Sep 2005 20:40:16 -0000	1.7
@@ -1,7 +1,8 @@
+ExclusiveArch: %{ix86} ppc
+
 Name:           jogl
 Version:        1.1.1
-Release:        5
-Epoch:          0
+Release:        6
 Summary:        Java bindings for the OpenGL API
 
 Group:          System Environment/Libraries
@@ -13,9 +14,10 @@
 Source3:        jogl-README.txt
 Patch0:		jogl-ppc.patch
 Patch1:		jogl-nojavadoclink.patch
+Patch2:		jogl-ppctools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ant, antlr, ant-antlr, jpackage-utils >= 0:1.5
+BuildRequires:  ant, antlr, ant-antlr, jpackage-utils >= 1.5
 BuildRequires:	xorg-x11-devel
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -42,12 +44,19 @@
 %setup -q -n jogl
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 cp %{SOURCE3} .
 
 %build
-(cd make && ant -Duser.home=%{_topdir}/SOURCES linux javadoc.dev.x11)
+
+TARGET=linux
+%ifarch ppc
+TARGET=linux.ppc
+%endif
+
+(cd make && ant -Duser.home=%{_topdir}/SOURCES $TARGET javadoc.dev.x11)
 
 # Rename the jar into a versioned jar name and create the .so version.
 mv build/jogl.jar build/%{name}-%{version}.jar
@@ -99,6 +108,10 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Sep  3 2005 Anthony Green <green at redhat.com> - 0:1.1.1-6
+- Add ppctools patch and only build for x86 and ppc for now.
+- Remove Epoch.
+
 * 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.