rpms/blender/F-7 blender-2.44-bid.patch, NONE, 1.1 blender-2.45-sc.patch, NONE, 1.1 blender.spec, 1.66, 1.67

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14478

Modified Files:
	blender.spec 
Added Files:
	blender-2.44-bid.patch blender-2.45-sc.patch 
Log Message:
Fix scons incompatiblity issue

blender-2.44-bid.patch:

--- NEW FILE blender-2.44-bid.patch ---
--- blender-2.44/release/plugins/bmake.bid	2004-12-27 20:28:48.000000000 +0100
+++ blender-2.44/release/plugins/bmake	2007-08-09 18:13:34.000000000 +0200
@@ -60,10 +60,10 @@ elif ( test $UNAME = "OpenBSD" ) then
 	LDFLAGS="-Bshareable";
 elif ( test $UNAME = "Linux" ) then
 	CC="gcc";
-	CFLAGS="-fPIC -funsigned-char -O2";
+	CFLAGS="${RPM_OPT_FLAGS} -fPIC -funsigned-char";
 
-	LD="ld";
-	LDFLAGS="-Bshareable";
+	LD="gcc";
+	LDFLAGS="--shared ${RPM_OPT_FLAGS}";
 elif ( test $UNAME = "SunOS" ) then
 	CC="cc";
 	CFLAGS="-O";

blender-2.45-sc.patch:

--- NEW FILE blender-2.45-sc.patch ---
diff -up blender-2.45/tools/btools.py.scons blender-2.45/tools/btools.py
--- blender-2.45/tools/btools.py.scons	2007-09-18 07:00:48.000000000 +0200
+++ blender-2.45/tools/btools.py	2008-04-24 19:09:11.000000000 +0200
@@ -1,7 +1,6 @@
 import os
 import os.path
 import SCons.Options
-import SCons.Options.BoolOption
 try:
     import subprocess
 except ImportError:
@@ -12,7 +11,7 @@ import shutil
 import sys
 
 Options = SCons.Options
-BoolOption = SCons.Options.BoolOption
+BoolOption = SCons.Options.BoolOption 
 
 def print_arguments(args, bc):
     if len(args):


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- blender.spec	24 Apr 2008 14:55:43 -0000	1.66
+++ blender.spec	24 Apr 2008 17:32:27 -0000	1.67
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.45
-Release: 	11%{?dist}
+Release: 	12%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -29,6 +29,7 @@
 Patch2:		blender-2.44-bid.patch
 Patch3:		blender-2.45-gcc43.patch
 Patch4:         blender-2.45-yafray.patch
+Patch5:		blender-2.45-sc.patch
 
 Patch100:	blender-2.45-cve-2008-1102.patch
 
@@ -83,6 +84,8 @@
 %patch4 -p1
 %endif
 
+%patch5 -p1 -b .scons
+
 %patch100 -p1 -b .cve
 
 PYVER=$(%{__python} -c "import sys ; print sys.version[:3]")
@@ -187,6 +190,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Thu Apr 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-12
+- Fix scons incompatiblity issue
+
 * Thu Apr 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-11
 - Fix CVS-2008-1102 (#443936)