rpms/sdljava/devel sdljava-0.9.1-ftgl213.patch, NONE, 1.1 sdljava.spec, 1.10, 1.11

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/sdljava/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18693

Modified Files:
	sdljava.spec 
Added Files:
	sdljava-0.9.1-ftgl213.patch 
Log Message:
* Fri May 22 2009 Hans de Goede <hdegoede at redhat.com> 0.9.1-12
- Rebuild for new ftgl (#501323)


sdljava-0.9.1-ftgl213.patch:

--- NEW FILE sdljava-0.9.1-ftgl213.patch ---
diff -up sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i~ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i
--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i~	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTFont.i	2009-05-22 12:52:37.000000000 +0200
@@ -1,5 +1,3 @@
-%feature("notabstract") FTFont;
-
 class FTFont
 {
     public:
diff -up sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i~ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i
--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i~	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/FTGL.i	2009-05-22 12:55:12.000000000 +0200
@@ -1,13 +1,6 @@
 %module SWIG_FTGL
 %{
-    #include "FTFont.h"
-    #include "FTFace.h"
-    #include "FTGLBitmapFont.h"
-    #include "FTGLExtrdFont.h"
-    #include "FTGLOutlineFont.h"
-    #include "FTGLPixmapFont.h"
-    #include "FTGLPolygonFont.h"
-    #include "FTGLTextureFont.h"
+    #include <FTGL/ftgl.h>
 
   void SWIG_BBox(const char* string, FTFont* font, float* llx, float* lly, float* llz, float* urx, float* ury, float* urz) {
     font->BBox(string, *llx, *lly, *llz, *urx, *ury, *urz);
@@ -35,7 +28,6 @@
 typedef int FT_Error;
 
 %include "FTFont.i"
-%include "FTFace.i"
 %include "FTGLBitmapFont.i"
 %include "FTGLExtrdFont.i"
 %include "FTGLOutlineFont.i"


Index: sdljava.spec
===================================================================
RCS file: /cvs/extras/rpms/sdljava/devel/sdljava.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sdljava.spec	26 Feb 2009 00:12:30 -0000	1.10
+++ sdljava.spec	22 May 2009 12:14:13 -0000	1.11
@@ -7,7 +7,7 @@
 
 Name:           sdljava
 Version:        0.9.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Java binding to the SDL API
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -17,6 +17,7 @@ Url:            http://sdljava.sourcefor
 Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}-runtest.sh
 Patch0:         sdljava-0.9.1-regen.patch
+Patch1:         sdljava-0.9.1-ftgl213.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel
 BuildRequires:  SDL_mixer-devel SDL_ttf-devel java-gcj-compat-devel
@@ -57,7 +58,11 @@ Demonstrations and samples for %{name}.
 %prep
 %setup -q
 %patch0 -p1 -z .regen
+%patch1 -p1
+# Newer ftgl no longer exports the FTFace class
+rm src/org/gljava/opengl/ftgl/FTFace.java
 iconv -f ISO_8859-2 -t UTF8 docs/CHANGES_0_9_1 > docs/CHANGES_0_9_1.tmp
+touch -r docs/CHANGES_0_9_1 docs/CHANGES_0_9_1.tmp
 mv docs/CHANGES_0_9_1.tmp docs/CHANGES_0_9_1
 
 # patch in gcc include path so that swig can find it
@@ -209,6 +214,9 @@ ln -s %{name}-%{version} %{_javadocdir}/
 
 
 %changelog
+* Fri May 22 2009 Hans de Goede <hdegoede at redhat.com> 0.9.1-12
+- Rebuild for new ftgl (#501323)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild