diff --git a/blender-2.42-scons.patch b/blender-2.42-scons.patch deleted file mode 100644 index cd297f8..0000000 --- a/blender-2.42-scons.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- blender2.42/SConstruct.org 2006-06-23 20:52:31.000000000 +0200 -+++ blender2.42/SConstruct 2006-07-17 19:09:52.000000000 +0200 -@@ -181,7 +183,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 diff --git a/blender-2.44.config b/blender-2.44.config index 5e37492..48eefdf 100644 --- a/blender-2.44.config +++ b/blender-2.44.config @@ -117,6 +117,8 @@ CXX = 'g++' ##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'] diff --git a/blender.spec b/blender.spec index bb26221..9a229ad 100644 --- a/blender.spec +++ b/blender.spec @@ -4,7 +4,7 @@ Name: blender Version: 2.44 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -26,7 +26,7 @@ Source5: blender.xml 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 @@ secure, multi-platform content to the web, CD-ROMs, and other media. %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 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mime/packages/blender.xml %changelog +* Mon May 21 2007 Jochen Schmitt - 2.44-3 +- Use of $$RPM_OPT_FLAGS to compile blender + * Sun May 20 2007 Jochen Schmitt 2.44-2 - Increase release number