rpms/blender/devel blender-2.47-scons.patch, 1.2, 1.3 blender.spec, 1.94, 1.95

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/blender/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26803

Modified Files:
	blender-2.47-scons.patch blender.spec 
Log Message:
* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.48a-7
- Fix optflags use, this time for real


blender-2.47-scons.patch:

Index: blender-2.47-scons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blender/devel/blender-2.47-scons.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- blender-2.47-scons.patch	27 Dec 2008 09:04:40 -0000	1.2
+++ blender-2.47-scons.patch	27 Dec 2008 12:20:53 -0000	1.3
@@ -1,6 +1,22 @@
+diff -up blender-2.48a/config/linux2-config.py.org blender-2.48a/config/linux2-config.py
+--- blender-2.48a/config/linux2-config.py.org	2008-12-27 13:17:57.000000000 +0100
++++ blender-2.48a/config/linux2-config.py	2008-12-27 13:17:59.000000000 +0100
+@@ -179,6 +179,12 @@ CCFLAGS = ['-pipe','-fPIC','-funsigned-c
+ 
+ CPPFLAGS = ['-DXP_UNIX']
+ CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
++
++import os
++RPM_OPT_FLAGS = os.environ['RPM_OPT_FLAGS'].split()
++CCFLAGS += RPM_OPT_FLAGS
++CXXFLAGS += RPM_OPT_FLAGS
++
+ REL_CFLAGS = ['-O2']
+ REL_CCFLAGS = ['-O2']
+ ##BF_DEPEND = True
 diff -up blender-2.48a/extern/SConscript.org blender-2.48a/extern/SConscript
 --- blender-2.48a/extern/SConscript.org	2008-10-22 18:38:21.000000000 +0200
-+++ blender-2.48a/extern/SConscript	2008-12-27 10:01:18.000000000 +0100
++++ blender-2.48a/extern/SConscript	2008-12-27 13:16:31.000000000 +0100
 @@ -2,8 +2,6 @@
  
  Import('env')
@@ -12,17 +28,8 @@
              'solid/SConscript'])
 diff -up blender-2.48a/SConstruct.org blender-2.48a/SConstruct
 --- blender-2.48a/SConstruct.org	2008-10-22 18:38:43.000000000 +0200
-+++ blender-2.48a/SConstruct	2008-12-27 10:02:54.000000000 +0100
-@@ -172,6 +172,8 @@ opts.Update(env)
- if not env['BF_FANCY']:
-     B.bc.disable()
- 
-+env['CCFLAGS'] = env['CCFLAGS'].split()
-+
- # disable elbeem (fluidsim) compilation?
- if env['BF_NO_ELBEEM'] == 1:
-     env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
-@@ -217,7 +219,7 @@ if env['OURPLATFORM'] == 'linux2' :
++++ blender-2.48a/SConstruct	2008-12-27 13:16:31.000000000 +0100
+@@ -217,7 +217,7 @@ if env['OURPLATFORM'] == 'linux2' :
  
          def CheckFreeAlut(context,env):
              context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )


Index: blender.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blender/devel/blender.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- blender.spec	27 Dec 2008 09:04:40 -0000	1.94
+++ blender.spec	27 Dec 2008 12:20:53 -0000	1.95
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.48a
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -86,7 +86,7 @@
 	 <%{SOURCE7} >user-config.py
 
 %build
-scons %{?_smp_mflags} blenderplayer BF_QUIET=0 CCFLAGS='%{optflags}'
+scons %{?_smp_mflags} blenderplayer BF_QUIET=0
 
 install -d release/plugins/include
 install -m 644 source/blender/blenpluginapi/*.h release/plugins/include
@@ -180,6 +180,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.48a-7
+- Fix optflags use, this time for real
+
 * Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.48a-6
 - Use proper compiler flags (see #199418)
 - Minor grammar & language fixes and tidy-ups