rpms/sdljava/F-7 sdljava-0.9.1-regen.patch, 1.1, 1.2 sdljava.spec, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22006

Modified Files:
	sdljava-0.9.1-regen.patch sdljava.spec 
Log Message:
* Wed Sep 19 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-4
- Make all doc files UTF-8


sdljava-0.9.1-regen.patch:

Index: sdljava-0.9.1-regen.patch
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/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:48:32 -0000	1.1
+++ sdljava-0.9.1-regen.patch	21 Sep 2007 19:27:37 -0000	1.2
@@ -44,34 +44,34 @@
 -#SDLVideo_wrap.c: SDLVideo.i common.i
 -#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 +SDLAudio_wrap.c: SDLAudio.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
 +
 +SDLCdrom_wrap.c: SDLCdrom.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
 +
 +SDLEvent_wrap.c: SDLEvent.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
 +
 +SDLGFX_wrap.c: SDLGFX.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
 +
 +SDLImage_wrap.c: SDLImage.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
 +
 +SDLJoystick_wrap.c: SDLJoystick.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
 +
 +SDLMain_wrap.c: SDLMain.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
 +
 +SDLMixer_wrap.c: SDLMixer.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
 +
 +SDLTTF_wrap.c: SDLTTF.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
 +
 +SDLVideo_wrap.c: SDLVideo.i common.i
-+	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
  
  %.o: %.c
  	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@@ -100,7 +100,7 @@
 -#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
 -#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 +glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-+	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
++	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
  
  %.o: %.c
  	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
@@ -124,7 +124,7 @@
 -#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
 -#	./post-process.rb
 +FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-+	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
++	$(SWIG) -Wall -c++ $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
 +	./post-process.rb
  
  %.o: %.cxx


Index: sdljava.spec
===================================================================
RCS file: /cvs/extras/rpms/sdljava/F-7/sdljava.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sdljava.spec	21 Sep 2007 17:48:32 -0000	1.1
+++ sdljava.spec	21 Sep 2007 19:27:37 -0000	1.2
@@ -88,6 +88,15 @@
 
 
 %build
+# ugly workaround for swig not defining __powerpc[64]__ when parsing on ppc[64]
+# -D__STRICT_ANSI__ works around swig barfing on bits/stdlib-ldbl.h
+%ifarch ppc
+export ARCH_DEFINE="-D__powerpc__ -D__STRICT_ANSI__"
+%endif
+%ifarch ppc64
+export ARCH_DEFINE="-D__powerpc64__ -D__STRICT_ANSI__"
+%endif
+
 pushd src/sdljava/native
 make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"
 make libsdljava_gfx.so CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC"