rpms/sdljava/devel sdljava-0.9.1-regen.patch, 1.1, 1.2 sdljava.spec, 1.4, 1.5

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	sdljava-0.9.1-regen.patch sdljava.spec 
Log Message:
* Sun Dec  9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-7
- And the dejavu-fonts fontfile names changed back again (what fun)
- The gcj bug causing us to not compile has been fixed, use gcj again
  and drop ExclusiveArch
- There is no reason for us to run ldconfig!
- Sigh we must now define __arch__ ourself as the newer swig doesn't


sdljava-0.9.1-regen.patch:

Index: sdljava-0.9.1-regen.patch
===================================================================
RCS file: /cvs/extras/rpms/sdljava/devel/sdljava-0.9.1-regen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdljava-0.9.1-regen.patch	21 Sep 2007 17:44:24 -0000	1.1
+++ sdljava-0.9.1-regen.patch	9 Dec 2007 23:53:54 -0000	1.2
@@ -6,7 +6,7 @@
  CFLAGS=-O3
  
 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
-+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I at GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I at GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit @ARCH_DEFINES@
  
  SDLJAVA_I=SDLAudio.i\
            SDLCdrom.i\
@@ -83,7 +83,7 @@
  CFLAGS=-O3
  
 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
-+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@
++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@ @ARCH_DEFINES@
  
  GLJAVA_I=glew.i
  
@@ -112,7 +112,7 @@
  CFLAGS=-O3
  
 -INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
-+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
++INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I at GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL @ARCH_DEFINES@
  
  FTGLJAVA_OBJ=FTGL_wrap.o
  FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl


Index: sdljava.spec
===================================================================
RCS file: /cvs/extras/rpms/sdljava/devel/sdljava.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sdljava.spec	9 Dec 2007 23:22:46 -0000	1.4
+++ sdljava.spec	9 Dec 2007 23:53:54 -0000	1.5
@@ -67,6 +67,29 @@
   etc/build/gljava/linux/Makefile \
   etc/build/gljava/linux/ftgl/Makefile
 
+# add arch defines for swig <-> SDL_config.h wrapper happiness
+# special case ppc as the define is powerpc not ppc and both ppc and ppc64
+# must be set for ppc64
+%ifarch ppc
+ARCHDEFS="-D__powerpc__"
+%endif
+%ifarch ppc64
+ARCHDEFS="-D__powerpc__ -D__powerpc64__"
+%endif
+# special case ix86 as all of ix86 should define __i386__
+%ifarch %{ix86}
+ARCHDEFS="-D__i386__"
+%endif
+# All other archs
+if [ -z "$ARCHDEFS" ]; then
+  ARCHDEFS="-D__%{_arch}__"
+fi
+# And actually patch the defines into the makefiles
+sed -i "s/@ARCH_DEFINES@/$ARCHDEFS/g" \
+  etc/build/linux/Makefile \
+  etc/build/gljava/linux/Makefile \
+  etc/build/gljava/linux/ftgl/Makefile
+
 # adjust testdata path in demos
 find ./testsrc -name '*.java' | xargs sed -i \
   -e 's|testdata|%{_datadir}/%{name}/testdata|g'
@@ -89,37 +112,17 @@
 
 
 %build
-
-# special case ppc as the define is powerpc not ppc and both ppc and ppc64
-# must be set for ppc64
-%ifarch ppc
-CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -fno-strict-aliasing -fPIC"
-%endif
-%ifarch ppc64
-CFLAGS="$RPM_OPT_FLAGS -D__powerpc__ -D__powerpc64__ -fno-strict-aliasing -fPIC"
-%endif
-
-# special case ix86 as all of ix86 should define __i386__
-%ifarch %{ix86}
-CFLAGS="$RPM_OPT_FLAGS -D__i386__ -fno-strict-aliasing -fPIC"
-%endif
-
-# All other archs
-if [ -z "$CFLAGS" ]; then
-  CFLAGS="$RPM_OPT_FLAGS -D__%{_arch}__ -fno-strict-aliasing -fPIC"
-fi
-
 pushd src/sdljava/native
-make CFLAGS="$CFLAGS"
-make libsdljava_gfx.so CFLAGS="$CFLAGS"
+make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
+make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
 popd
 
 pushd src/org/gljava/opengl/native
-make CFLAGS="$CFLAGS"
+make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
 popd
 
 pushd src/org/gljava/opengl/native/ftgl
-make CFLAGS="$CFLAGS"
+make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
 popd
 
 ant jar javadoc