diff --git a/blender-2.42a-x64.patch b/blender-2.42a-x64.patch deleted file mode 100644 index 68ebca1..0000000 --- a/blender-2.42a-x64.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- blender-2.42a/source/gameengine/Expressions/ListValue.cpp.orig 2004-06-07 12:03:11.000000000 +0100 -+++ blender-2.42a/source/gameengine/Expressions/ListValue.cpp 2006-09-29 15:10:27.000000000 +0100 -@@ -23,12 +23,12 @@ - #include - #endif - --int listvalue_bufferlen(PyObject* list) -+Py_ssize_t listvalue_bufferlen(PyObject* list) - { - return ( ((CListValue*)list)->GetCount()); - } - --PyObject* listvalue_buffer_item(PyObject* list,int index) -+PyObject* listvalue_buffer_item(PyObject* list,Py_ssize_t index) - { - if (index >= 0 && index < ((CListValue*) list)->GetCount()) - { -@@ -68,7 +68,7 @@ - - - /* just slice it into a python list... */ --PyObject* listvalue_buffer_slice(PyObject* list,int ilow, int ihigh) -+PyObject* listvalue_buffer_slice(PyObject* list,Py_ssize_t ilow, Py_ssize_t ihigh) - { - int i, j; - PyListObject *newlist; -@@ -163,22 +163,22 @@ - - - static PySequenceMethods listvalue_as_sequence = { -- (inquiry)listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/ -+ (lenfunc)listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/ - (binaryfunc)listvalue_buffer_concat, /*sq_concat*/ -- 0,//(intargfunc)buffer_repeat, /*sq_repeat*/ -- (intargfunc)listvalue_buffer_item, /*sq_item*/ -- (intintargfunc)listvalue_buffer_slice, /*sq_slice*/ -- 0,//(intobjargproc)buffer_ass_item, /*sq_ass_item*/ -- 0,//(intintobjargproc)buffer_ass_slice, /*sq_ass_slice*/ -+ (ssizeargfunc)0,//(intargfunc)buffer_repeat, /*sq_repeat*/ -+ (ssizeargfunc)listvalue_buffer_item, /*sq_item*/ -+ (ssizessizeargfunc)listvalue_buffer_slice, /*sq_slice*/ -+ (ssizeobjargproc)0,//(intobjargproc)buffer_ass_item, /*sq_ass_item*/ -+ (ssizessizeobjargproc)0,//(intintobjargproc)buffer_ass_slice, /*sq_ass_slice*/ - }; - - - - /* Is this one used ? */ - static PyMappingMethods instance_as_mapping = { -- (inquiry)listvalue_bufferlen, /*mp_length*/ -+ (lenfunc)listvalue_bufferlen, /*mp_length*/ - (binaryfunc)listvalue_mapping_subscript, /*mp_subscript*/ -- 0,//(objobjargproc)instance_ass_subscript, /*mp_ass_subscript*/ -+ (objobjargproc)0,//(objobjargproc)instance_ass_subscript, /*mp_ass_subscript*/ - }; - - diff --git a/blender.spec b/blender.spec index e7356ba..0aa3cd2 100644 --- a/blender.spec +++ b/blender.spec @@ -3,7 +3,7 @@ Name: blender Version: 2.42a -Release: 18%{?dist} +Release: 5%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -20,7 +20,6 @@ Source6: blender-wrapper Source7: blender-2.42.config Patch1: blender-2.42-scons.patch -Patch2: blender-2.42a-x64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +51,8 @@ Requires(post): shared-mime-info Requires(postun): desktop-file-utils Requires(postun): shared-mime-info +ExcludeArch: x86_64 + %description Blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback. @@ -62,7 +63,6 @@ secure, multi-platform content to the web, CD-ROMs, and other media. %prep %setup -q %patch1 -p1 -%patch2 -p1 -b .org %build cp %{SOURCE7} user-config.py @@ -162,6 +162,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/mime/packages/blender.xml %changelog +* Sun Apr 22 2007 Jochen Schmitt - 2.42a-5 +- Romove package from the x86_64 arc (#237423) + * Mon Jan 8 2007 Jochen Schmitt 2.42a-18 - Rebult