From 0ca96a3b507e7920bb6bbd0670861270a15631dd Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Apr 27 2008 20:02:13 +0000 Subject: More generics patch to solve scons issue --- diff --git a/blender-2.45-sc.patch b/blender-2.45-sc.patch index 3be3a9d..a461aa4 100644 --- a/blender-2.45-sc.patch +++ b/blender-2.45-sc.patch @@ -1,20 +1,15 @@ 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 @@ ++++ blender-2.45/tools/btools.py 2008-04-27 21:23:27.000000000 +0200 +@@ -1,7 +1,10 @@ import os import os.path import SCons.Options -import SCons.Options.BoolOption ++try: ++ import SCons.Options.BoolOption ++except ImportError: ++ pass 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 4a6b6cc..f3cf2bb 100644 --- a/blender.spec +++ b/blender.spec @@ -3,7 +3,7 @@ Name: blender Version: 2.45 -Release: 12%{?dist} +Release: 13%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -190,6 +190,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mime/packages/blender.xml %changelog +* Sun Apr 27 2008 Jochen Schmitt 2.45-13 +- More generic patch to solve scons issue + * Thu Apr 24 2008 Jochen Schmitt 2.45-12 - Fix scons incompatiblity issue