rpms/blender/F-8 blender-2.45-sc.patch, 1.1, 1.2 blender.spec, 1.74, 1.75
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Sun Apr 27 20:00:59 UTC 2008
Author: s4504kr
Update of /cvs/extras/rpms/blender/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26699
Modified Files:
blender-2.45-sc.patch blender.spec
Log Message:
More generic patch to solve scons issue
blender-2.45-sc.patch:
Index: blender-2.45-sc.patch
===================================================================
RCS file: /cvs/extras/rpms/blender/F-8/blender-2.45-sc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blender-2.45-sc.patch 24 Apr 2008 17:24:22 -0000 1.1
+++ blender-2.45-sc.patch 27 Apr 2008 20:00:22 -0000 1.2
@@ -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):
Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-8/blender.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- blender.spec 24 Apr 2008 17:28:36 -0000 1.74
+++ blender.spec 27 Apr 2008 20:00:22 -0000 1.75
@@ -3,7 +3,7 @@
Name: blender
Version: 2.45
-Release: 12%{?dist}.1
+Release: 13%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -189,6 +189,9 @@
%{_datadir}/mime/packages/blender.xml
%changelog
+* Sun Apr 27 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-13
+- More generic patch to solve scons issue
+
* Thu Apr 24 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.45-12.1
- Fix scons compatiblity issue
More information about the fedora-extras-commits
mailing list