diff --git a/blender-2.49.config b/blender-2.49.config index eb29c5f..db8be56 100644 --- a/blender-2.49.config +++ b/blender-2.49.config @@ -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' diff --git a/blender-repack.sh b/blender-repack.sh index 5485a15..f469d5c 100755 --- a/blender-repack.sh +++ b/blender-repack.sh @@ -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 diff --git a/blender.spec b/blender.spec index 054c60b..19b3e00 100644 --- a/blender.spec +++ b/blender.spec @@ -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 2.49a-4 +- Rebuild for python-2.6.2 + * Fri Jul 24 2009 Fedora Release Engineering - 2.49a-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild