From ba93fd934ef1d0dd9e6f493c4782ee5e4d84239a Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Apr 24 2008 17:13:48 +0000 Subject: Fix odd scons compatiblity issue --- diff --git a/blender-2.45-sc.patch b/blender-2.45-sc.patch new file mode 100644 index 0000000..3be3a9d --- /dev/null +++ b/blender-2.45-sc.patch @@ -0,0 +1,20 @@ +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): diff --git a/blender.spec b/blender.spec index c1adc6e..c473027 100644 --- a/blender.spec +++ b/blender.spec @@ -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 @@ Patch1: blender-2.44-scons.patch 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 @@ -77,6 +78,7 @@ available. %patch1 -p1 -b .org %patch2 -p1 -b .bid %patch3 -p1 -b .gcc43 +%patch5 -p1 -b .scons %if "%{?_lib}" == "lib64" @@ -187,6 +189,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mime/packages/blender.xml %changelog +* Thu Apr 24 2008 Jochen Schmitt 2.45-12 +- Fix odd scons compatibility issue + * Thu Apr 24 2008 Jochen Schmitt 2.45-11 - Fix CVS-2008-1102 (#443937)