diff --git a/blender-2.56-gcc46.patch b/blender-2.56-gcc46.patch deleted file mode 100644 index f9ab07e..0000000 --- a/blender-2.56-gcc46.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h ---- blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2009-09-14 11:45:32.000000000 -0300 -+++ blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h 2011-02-08 22:32:34.300937158 -0200 -@@ -177,6 +177,7 @@ - /* Material */ - struct Material : Element - { -+ Material (){} - btScalar m_kLST; // Linear stiffness coefficient [0,1] - btScalar m_kAST; // Area/Angular stiffness coefficient [0,1] - btScalar m_kVST; // Volume stiffness coefficient [0,1] -@@ -191,6 +192,7 @@ - /* Node */ - struct Node : Feature - { -+ Node (){} - btVector3 m_x; // Position - btVector3 m_q; // Previous step position - btVector3 m_v; // Velocity -@@ -204,6 +206,7 @@ - /* Link */ - struct Link : Feature - { -+ Link (){} - Node* m_n[2]; // Node pointers - btScalar m_rl; // Rest length - int m_bbending:1; // Bending link -@@ -215,6 +218,7 @@ - /* Face */ - struct Face : Feature - { -+ Face (){} - Node* m_n[3]; // Node pointers - btVector3 m_normal; // Normal - btScalar m_ra; // Rest area -@@ -255,6 +259,7 @@ - /* Note */ - struct Note : Element - { -+ Note (){} - const char* m_text; // Text - btVector3 m_offset; // Offset - int m_rank; // Rank diff --git a/blender.spec b/blender.spec index e270f21..7da1ad9 100644 --- a/blender.spec +++ b/blender.spec @@ -12,7 +12,7 @@ Name: blender Epoch: 1 Version: 2.61 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -31,8 +31,7 @@ Patch2: blender-2.61-syspath.patch Patch4: blender-2.48-undefine-operation.patch Patch5: blender-2.50-uninit-var.patch -Patch6: blender-2.56-gcc46.patch -Patch7: blender-2.61-gcc47.patch +Patch6: blender-2.61-gcc47.patch Patch10: blender-2.58-python_include.patch @@ -143,7 +142,6 @@ addon packages to extend blender. %patch4 -p0 %patch5 -p0 %patch6 -p1 -%patch7 -p1 -b .gcc47 %patch10 -p1 @@ -294,6 +292,9 @@ fi || : %{_sysconfdir}/rpm/macros.blender %changelog +* Thu Feb 9 2012 Jochen Schmitt - 1:2.61-4 +- Remove unnecessary gcc-4.5 patch + * Wed Feb 8 2012 Jochen Schmitt 1:2.61-3 - Fix gcc-4.7 related issue