[blender] fix dbgedit issue
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Feb 22 16:30:39 UTC 2013
commit 5270edc75fca4fc5d6ebaba9b7e13c418834321e
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Feb 22 17:30:29 2013 +0100
fix dbgedit issue
blender-2.66-dbgedit.patch | 12 ++++++++++++
blender.spec | 6 ++++++
2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/blender-2.66-dbgedit.patch b/blender-2.66-dbgedit.patch
new file mode 100644
index 0000000..afcdfa7
--- /dev/null
+++ b/blender-2.66-dbgedit.patch
@@ -0,0 +1,12 @@
+diff -up blender-2.66/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp.dbg blender-2.66/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+--- blender-2.66/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp.dbg 2013-02-22 16:29:56.783083071 +0100
++++ blender-2.66/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp 2013-02-22 16:32:35.832668869 +0100
+@@ -33,7 +33,7 @@ subject to the following restrictions:
+ #include "KX_GameObject.h"
+
+ #include "BulletSoftBody/btSoftBody.h"
+-#include "BulletSoftBody//btSoftBodyInternals.h"
++#include "BulletSoftBody/btSoftBodyInternals.h"
+ #include "BulletSoftBody/btSoftBodyHelpers.h"
+ #include "LinearMath/btConvexHull.h"
+ #include "BulletCollision/Gimpact/btGImpactShape.h"
diff --git a/blender.spec b/blender.spec
index 496557f..b1d11ab 100644
--- a/blender.spec
+++ b/blender.spec
@@ -30,6 +30,9 @@ Source10: macros.blender
Patch1: blender-2.66-syspath.patch
Patch2: blender-2.66-droid.patch
+# New rpm release does't like '//' in includes
+Patch3: blender-2.66-dbgedit.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libtool
@@ -130,6 +133,7 @@ addon packages to extend blender.
%patch1 -p1 -b .syspath
%patch2 -p1 -b .droid
+%patch3 -p1 -b .dbg
find -name '.svn' -print | xargs rm -rf
@@ -267,6 +271,8 @@ fi || :
%changelog
* Thu Feb 21 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.66-1
- New upstream release
+- Remove unnecessaries patches
+- Add Patch to remove '//' in includes
* Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora at m4x.org> - 1:2.65a-5
- Rebuild for Boost-1.53.0
More information about the scm-commits
mailing list