rpms/blender/EL-5 blender-2.44-scons.patch, 1.3, 1.4 blender.spec, 1.44, 1.45

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/blender/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21777

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


blender-2.44-scons.patch:

Index: blender-2.44-scons.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blender/EL-5/blender-2.44-scons.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blender-2.44-scons.patch	27 Dec 2008 09:57:09 -0000	1.3
+++ blender-2.44-scons.patch	27 Dec 2008 11:53:32 -0000	1.4
@@ -1,18 +1,23 @@
-diff -up blender-2.45/SConstruct.scons blender-2.45/SConstruct
---- blender-2.45/SConstruct.scons	2008-12-27 10:09:33.000000000 +0100
-+++ blender-2.45/SConstruct	2008-12-27 10:09:15.000000000 +0100
-@@ -170,6 +170,8 @@ else:
- opts = btools.read_opts(optfiles, B.arguments)
- opts.Update(env)
+diff -up blender-2.45/config/linux2-config.py.org blender-2.45/config/linux2-config.py
+--- blender-2.45/config/linux2-config.py.org	2007-09-18 06:59:16.000000000 +0200
++++ blender-2.45/config/linux2-config.py	2008-12-27 12:36:44.000000000 +0100
+@@ -137,6 +137,12 @@ CCFLAGS = ['-pipe','-fPIC','-funsigned-c
  
-+env['CCFLAGS'] = env['CCFLAGS'].split()
+ CPPFLAGS = ['-DXP_UNIX']
+ CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
 +
- # disable elbeem (fluidsim) compilation?
- if env['BF_NO_ELBEEM'] == 1:
-     env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
---- blender-2.44/SConstruct.orig	2007-05-07 18:09:40.000000000 +0200
-+++ blender-2.44/SConstruct	2007-05-20 22:52:13.000000000 +0200
-@@ -237,7 +242,7 @@
++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.45/SConstruct.org blender-2.45/SConstruct
+--- blender-2.45/SConstruct.org	2007-09-18 06:59:24.000000000 +0200
++++ blender-2.45/SConstruct	2008-12-27 12:35:46.000000000 +0100
+@@ -198,7 +198,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/EL-5/blender.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- blender.spec	27 Dec 2008 09:12:03 -0000	1.44
+++ blender.spec	27 Dec 2008 11:53:32 -0000	1.45
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.45
-Release: 	16%{?dist}
+Release: 	17%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -94,7 +94,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
@@ -184,6 +184,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.45-17
+- Fix optflags use, this time for real
+
 * Sat Dec 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 2.45-16
 - Use proper compiler flags (see #199418)
 - Minor grammar & language fixes and tidy-ups