rpms/blender/F-7 blender-2.44-scons.patch, NONE, 1.1 blender-2.44.config, 1.1, 1.2 blender.spec, 1.56, 1.57 blender-2.42-scons.patch, 1.2, NONE

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/blender/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2944

Modified Files:
	blender-2.44.config blender.spec 
Added Files:
	blender-2.44-scons.patch 
Removed Files:
	blender-2.42-scons.patch 
Log Message:
Build with $$RPM_OPT_FLAGS

blender-2.44-scons.patch:

--- NEW FILE blender-2.44-scons.patch ---
--- 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 @@
 
         def CheckFreeAlut(context,env):
             context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )
-            env['LIBS'] = 'alut'
+            env['LIBS'] = ['alut', 'openal']
             result = context.TryLink(mylib_test_source_file, '.c')
             context.Result(result)
             return result


Index: blender-2.44.config
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender-2.44.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blender-2.44.config	20 May 2007 20:36:33 -0000	1.1
+++ blender-2.44.config	22 May 2007 18:08:10 -0000	1.2
@@ -117,6 +117,8 @@
 ##ifeq ($CPU),alpha)
 ##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
 
+CFLAGS += '${RPM_OPT_FLAGS}'
+
 # CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
 
 CPPFLAGS = ['-DXP_UNIX']


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/F-7/blender.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- blender.spec	20 May 2007 20:38:45 -0000	1.56
+++ blender.spec	22 May 2007 18:08:10 -0000	1.57
@@ -4,7 +4,7 @@
 
 Name:           blender
 Version:        2.44
-Release: 	2%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -26,7 +26,7 @@
 Source6:        blender-wrapper
 Source7:	blender-2.44.config
 
-Patch1:         blender-2.42-scons.patch
+Patch1:         blender-2.44-scons.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -69,7 +69,7 @@
 
 %prep
 %setup -q 
-%patch1 -p1
+%patch1 -p1 -b .org
 sed -e 's|@LIB@|%{_libdir}|g' -e 's/@PYVER@/%{pyver}/g' \
 	 <%{SOURCE7} >user-config.py
 
@@ -170,6 +170,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Mon May 21 2007 Jochen Schmitt <Jochen herr-schmitt de> - 2.44-4
+- Use of $$RPM_OPT_FLAGS to compile blender
+
 * Sun May 20 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.44-2
 - Increase release number
 


--- blender-2.42-scons.patch DELETED ---