From a080e0f95b555726679beb8c420fe171aaded0df Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <s4504kr@fedoraproject.org>
Date: Jun 02 2009 20:13:15 +0000
Subject: Try to build agains more system libraries as possible


---

diff --git a/blender-2.49.config b/blender-2.49.config
index 2c77f79..daa2806 100644
--- a/blender-2.49.config
+++ b/blender-2.49.config
@@ -50,9 +50,9 @@ BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '@LIB@'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = '/usr'
-BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
-BF_FTGL_LIB = 'ftgl'
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include/'
+BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE='true'
 
diff --git a/blender-wrapper b/blender-wrapper
index 12c6927..8466c41 100644
--- a/blender-wrapper
+++ b/blender-wrapper
@@ -6,11 +6,7 @@
 # In case user's home directory doesn't contain ~/.blender, copy it
 # from /usr/share/blender
 
-if [ -x /usr/bin/blender-freeworld.bin ]; then
-    blend="blender-freeworld"
-else
-    blend="blender"
-fi
+blend="blender"
 
 if [ ! -d ~/.blender ]; then
     install -d ~/.blender
@@ -38,7 +34,7 @@ if [ ! -d ~/.blender ]; then
 
     if [ -d /usr/lib64/$blend/plugins ]; then
 	ln -sf /usr/lib64/$blend/plugins/sequence ~/.blender/plugins/sequence
-	ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugin/textrure
+	ln -sf /usr/lib64/$blend/plugins/texture ~/.blender/plugin/texture
     fi
 fi
 
diff --git a/blender.spec b/blender.spec
index 3270f49..d7a8f98 100644
--- a/blender.spec
+++ b/blender.spec
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -32,6 +32,7 @@ Source8:	blender-2.49.config
 Patch1:         blender-2.49-scons.patch
 Patch2:		blender-2.44-bid.patch
 
+# Both patches are forwarded to upstream via email
 Patch100:	blender-2.46rc3-cve-2008-1103-1.patch
 Patch101:	blender-2.48a-cve-2008-4863.patch
 
@@ -63,10 +64,10 @@ BuildRequires:  glew-devel
 BuildRequires:	fontpackages-devel
 
 BuildRequires:	fftw-devel
-BuildRequires:	ftgl-devel
+#BuildRequires:	ftgl-devel
 BuildRequires:	ode-devel
 BuildRequires:	openjpeg-devel
-
+#BuildRequires:  qhull-devel
 
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
@@ -112,11 +113,11 @@ Blender Geaming Engine.
 %patch100 -p1
 %patch101 -p1
 
+#rm -rf extern/bFTGL
 rm -rf extern/fftw
-rm -rf extern/ftgl
 rm -rf extern/glew
 rm -rf extern/libopenjpeg
-rm -rf extern/libredcode
+#rm -rf extern/qhull
 rm -rf extern/ode
 rm -rf extern/xvidcore
 
@@ -241,7 +242,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
-* Tue Jun  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-2
+* Tue Jun  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-3
 - Try to build agains more system libraries as possible
 
 * Mon Jun  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49-1