rpms/blender/devel blender-2.49.config, 1.4, 1.5 blender-repack.sh, 1.2, 1.3 blender.spec, 1.121, 1.122

[Jochen Schmitt]

Author: s4504kr

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

Modified Files:
	blender-2.49.config blender-repack.sh blender.spec 
Log Message:
Rebuild for python-2.6.2


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


Index: blender-repack.sh
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-repack.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- blender-repack.sh	19 Jun 2009 13:54:39 -0000	1.2
+++ blender-repack.sh	3 Aug 2009 16:38:43 -0000	1.3
@@ -24,7 +24,7 @@ pushd extern
 #Removed because of ip
   rm -rf ffmpeg libmp3lame x264 xvidcore
 #Removed because we can expect to use system one
-  rm -rf fftw glew libopenjpeg ode qhull make verse
+#  rm -rf fftw glew libopenjpeg ode qhull make verse
 #Will have to be removed later: bFTGL
 popd
 rm -rf scons


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- blender.spec	24 Jul 2009 18:09:52 -0000	1.121
+++ blender.spec	3 Aug 2009 16:38:43 -0000	1.122
@@ -5,7 +5,7 @@
 
 Name:           blender
 Version:        2.49a
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -80,8 +80,6 @@ Requires:	  dejavu-fonts
 Provides:	  blender-fonts = %{version}-%{release}
 Obsoletes:	  blender-fonts <= 2.48a-9
 
-
-
 %description
 Blender is the essential software solution you need for 3D, from modeling,
 animation, rendering and post-production to interactive creation and playback.
@@ -110,6 +108,20 @@ Blender Game Engine.
 %patch100 -p1
 %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
+rm -rf extern/libmp3lame
+rm -rf extern/libopenjpeg
+rm -rf extern/libredcode
+rm -rf extern/ode
+rm -rf extern/x264
+rm -rf extern/xvidcore
+rm -rf extern/qhull
+rm -rf extern/make
+rm -rf extern/verse
 
 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -233,6 +245,9 @@ fi || :
 %{_bindir}/blenderplayer.bin
 
 %changelog
+* Mon Aug  3 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.49a-4
+- Rebuild for python-2.6.2
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.49a-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild