rpms/blender/devel blender-2.49.config, 1.5, 1.6 blender.spec, 1.122, 1.123

[Jochen Schmitt]

Author: s4504kr

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

Modified Files:
	blender-2.49.config blender.spec 
Log Message:
Revoke of using system FTGL


Index: blender-2.49.config
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-2.49.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- blender-2.49.config	3 Aug 2009 16:38:43 -0000	1.5
+++ blender-2.49.config	3 Aug 2009 17:49:47 -0000	1.6
@@ -50,9 +50,9 @@ BF_GETTEXT_LIB = 'gettextlib qhull'
 BF_GETTEXT_LIBPATH = '@LIB@'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = '/usr'
-BF_FTGL_INC = '${BF_FTGL}/include/FTGL'
-BF_FTGL_LIB = ['ftgl', '@LIB@']
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE='true'
 


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- blender.spec	3 Aug 2009 16:38:43 -0000	1.122
+++ blender.spec	3 Aug 2009 17:49:47 -0000	1.123
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49a
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -109,7 +109,6 @@ Blender Game Engine.
 %patch101 -p1
 
 # binreloc is not a part of fedora
-rm -rf extern/bFTGL
 rm -rf extern/ffmpeg
 rm -rf extern/fftw
 rm -rf extern/glew
@@ -245,6 +244,9 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-5
+- Revoke using of system FTGL library
+
 * Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-4
 - Rebuild for python-2.6.2